diff --git a/.github/workflows/generate-single-openapi-spec.yaml b/.github/workflows/generate-single-openapi-spec.yaml
index 4925651b..0569c03c 100644
--- a/.github/workflows/generate-single-openapi-spec.yaml
+++ b/.github/workflows/generate-single-openapi-spec.yaml
@@ -33,9 +33,9 @@ jobs:
           name: artifacts-${{ github.workflow }}-${{ github.run_id }}-${{ github.run_number }}
           path: generated/artifacts
   commit-single-spec:
-    if: github.event_name == 'push'
     runs-on: ubuntu-latest
     needs: build-single-spec
+    if: github.event_name == 'push'
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v2
@@ -48,6 +48,9 @@ jobs:
           git config user.name "GitHub Actions Bot"
           git config user.email "<>"
           git diff
-          git status --porcelain && git add generated/artifacts && \
-          git commit -m "Update single file spec" && \
-          git push
\ No newline at end of file
+          if [ "$(git status -s)" != "" ];
+          then
+            git add generated/artifacts && \
+            git commit -m "Update single file spec" && \
+            git push
+          fi
\ No newline at end of file
diff --git a/generator/script/generate.sh b/generator/script/generate.sh
index 49cf8c09..d9f68452 100755
--- a/generator/script/generate.sh
+++ b/generator/script/generate.sh
@@ -26,7 +26,7 @@ do
 
     ( cat generator/configuration/common.yaml && echo &&
       cat generator/configuration/${GENERATOR}.yaml ) | \
-        API_VERSION=1.6.0 GENERATOR=${GENERATOR} envsubst >| \
+        GENERATOR=${GENERATOR} envsubst >| \
         ${GENERATED_CONFIG_FILE}
 
     echo "Configuration for generator ${GENERATOR} built."