diff --git a/.github/workflows/composite/generate-sdk/action.yml b/.github/workflows/composite/generate-sdk/action.yml
index 02691e3f..02e3cd41 100644
--- a/.github/workflows/composite/generate-sdk/action.yml
+++ b/.github/workflows/composite/generate-sdk/action.yml
@@ -20,6 +20,20 @@ runs:
     - name: Install openapi-generator-cli
       shell: bash
       run: npm install -g @openapitools/openapi-generator-cli
+    - name: Cleanup existing files
+      shell: bash
+      run: |
+        echo "Moving version.py file out..."
+        mv ./${{ inputs.package-name }}/${{ inputs.package-name }}/version.py ./version.py
+
+        echo "Cleaning up ${{ inputs.package-name }}..."
+        rm -rf ./${{ inputs.package-name }}/*
+
+        echo "Re-creating folder inside ${{ inputs.package-name }}..."
+        mkdir ./${{ inputs.package-name }}/${{ inputs.package-name }}
+
+        echo "Moving version.py file back in..."
+        mv ./version.py ./${{ inputs.package-name }}/${{ inputs.package-name }}/version.py
     - name: Download spec files
       shell: bash
       run: wget ${{ inputs.spec-link }} -O ./${{ inputs.package-name }}/${{ inputs.package-name }}.spec.yaml
diff --git a/.github/workflows/generate-all.yml b/.github/workflows/generate-all.yml
index 639f4630..47f21681 100644
--- a/.github/workflows/generate-all.yml
+++ b/.github/workflows/generate-all.yml
@@ -103,6 +103,18 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
+      - name: Clean up modules
+        run: |
+          rm -rf ./pnap_audit_api \
+           ./pnap_bmc_api \
+           ./pnap_ip_api \
+           ./pnap_location_api \
+           ./pnap_network_api \
+           ./pnap_network_storage_api \
+           ./pnap_rancher_solution_api \
+           ./pnap_tag_api \
+           ./pnap_payment_api \
+           ./pnap_invoice_api
       - name: Download Artifacts
         uses: actions/download-artifact@v3
       - name: Move spec files