diff --git a/.github/workflows/generate-and-upload.yml b/.github/workflows/generate-and-upload.yml
new file mode 100644
index 0000000..a630dfc
--- /dev/null
+++ b/.github/workflows/generate-and-upload.yml
@@ -0,0 +1,30 @@
+name: Generate and upload report to KTU Moodle
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+
+jobs:
+  generate-and-upload:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Generate report
+      uses: RokasPuzonas/ktu-oop-report-generator@v1.0.1
+      with:
+        dotnet-version: 3.0.103
+        config-filename: report.toml
+        output-filename: report.pdf
+    - name: Upload report
+      uses: RokasPuzonas/ktu-moodle-assignment-upload@v1.0.0
+      with:
+        assignment-id: 1499
+        target-filename: report.pdf
+        upload-filename: IF-1-1_Rokas_Puzonas.pdf
+        ktu-username: ${{ secrets.KTU_USERNAME }}
+        ktu-password: ${{ secrets.KTU_PASSWORD }}
+
diff --git a/.github/workflows/generate-upload.yml b/.github/workflows/generate-upload.yml
deleted file mode 100644
index a2d4621..0000000
--- a/.github/workflows/generate-upload.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: Generate and upload report to KTU Moodle
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-
-jobs:
-  everything:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Generator report
-      uses: RokasPuzonas/ktu-oop-report-generator@v1.0.0
-      with:
-        dotnet-version: 3.0.103
-        config-filename: report.toml
-        output-filename: report.pdf
-    # - name: Setup .NET
-    #   uses: actions/setup-dotnet@v1
-    #   with:
-    #     dotnet-version: 3.0.103
-    # - name: Setup Python
-    #   uses: actions/setup-python@v2.3.1
-    #   with:
-    #     python-version: 3.x
-    # - name: Clone report generator
-    #   run: git clone https://github.com/RokasPuzonas/ktu-oop-report-generator
-    # - name: Setup report generator
-    #   run: |
-    #     cd ktu-oop-report-generator
-    #     python -m venv venv
-    #     source venv/bin/activate
-    #     pip install -r requirements.txt
-    # - name: Run report generator
-    #   run: |
-    #     cd ktu-oop-report-generator
-    #     source venv/bin/activate
-    #     ./main.py ../report.toml
-    # - name: Clone moodle uploader
-    #   run: git clone https://github.com/RokasPuzonas/ktu-moodle-assignment-upload
-    # - name: Setup Geckodriver
-    #   uses: browser-actions/setup-geckodriver@v0.0.0
-    # - name: Setup moodle uploader
-    #   run: |
-    #     cd ktu-moodle-assignment-upload
-    #     python -m venv venv
-    #     source venv/bin/activate
-    #     pip install -r requirements.txt
-    # - name: Run moodle uploader
-    #   run: |
-    #     cd ktu-moodle-assignment-upload
-    #     source venv/bin/activate
-    #     ./main.py 1499 ../report.pdf IF-1-1_Rokas_Puzonas.pdf
-    #   env:
-    #     KTU_USERNAME: ${{ secrets.KTU_USERNAME }}
-    #     KTU_PASSWORD: ${{ secrets.KTU_PASSWORD }}
-