diff --git a/.github/workflows/publish_connectors.yml b/.github/workflows/publish_connectors.yml
index e4938676901..c1215cf6d23 100644
--- a/.github/workflows/publish_connectors.yml
+++ b/.github/workflows/publish_connectors.yml
@@ -168,16 +168,16 @@ jobs:
             echo "Using a dev tag for a pre-release build: ${tag_override}"
           fi
 
-      # - name: Build and publish Python and Manifest-Only connectors images [On merge to master]
-      #   id: build-and-publish-python-manifest-only-connectors-images-master
-      #   if: github.event_name == 'push' && steps.connector-metadata.outputs.connector-language != 'java'
-      #   uses: ./.github/actions/connector-image-build-push
-      #   with:
-      #     connector-name: ${{ matrix.connector }}
-      #     push-latest: ${{ steps.get-connector-options.outputs.push-latest }}
-      #     dry-run: "false"
-      #     docker-hub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
-      #     docker-hub-password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      - name: Build and publish Python and Manifest-Only connectors images [On merge to master]
+        id: build-and-publish-python-manifest-only-connectors-images-master
+        if: github.event_name == 'push' && steps.connector-metadata.outputs.connector-language != 'java'
+        uses: ./.github/actions/connector-image-build-push
+        with:
+          connector-name: ${{ matrix.connector }}
+          push-latest: ${{ steps.get-connector-options.outputs.push-latest }}
+          dry-run: "false"
+          docker-hub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          docker-hub-password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: Publish connectors [On merge to master]
         # JVM docker images are published beforehand so Airbyte-CI only does registry publishing.
@@ -219,17 +219,17 @@ jobs:
         shell: bash
         run: ./poe-tasks/build-and-publish-java-connectors-with-tag.sh  ${{ inputs.publish-options }} --name ${{ matrix.connector }} --publish
 
-      # - name: Build and publish Python and Manifest-Only connectors images [manual]
-      #   id: build-and-publish-python-manifest-only-connectors-images-manual
-      #   if: (github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call') && steps.connector-metadata.outputs.connector-language != 'java'
-      #   uses: ./.github/actions/connector-image-build-push
-      #   with:
-      #     connector-name: ${{ matrix.connector }}
-      #     push-latest: ${{ steps.get-connector-options.outputs.push-latest }}
-      #     tag-override: ${{ steps.get-connector-options.outputs.tag-override }}
-      #     dry-run: "false"
-      #     docker-hub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
-      #     docker-hub-password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      - name: Build and publish Python and Manifest-Only connectors images [manual]
+        id: build-and-publish-python-manifest-only-connectors-images-manual
+        if: (github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call') && steps.connector-metadata.outputs.connector-language != 'java'
+        uses: ./.github/actions/connector-image-build-push
+        with:
+          connector-name: ${{ matrix.connector }}
+          push-latest: ${{ steps.get-connector-options.outputs.push-latest }}
+          tag-override: ${{ steps.get-connector-options.outputs.tag-override }}
+          dry-run: "false"
+          docker-hub-username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          docker-hub-password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: Publish connectors [manual]
         id: publish-connectors-manual
diff --git a/docker-images/Dockerfile.manifest-only-connector b/docker-images/Dockerfile.manifest-only-connector
index 3058b1ed8e2..ce9111f144f 100644
--- a/docker-images/Dockerfile.manifest-only-connector
+++ b/docker-images/Dockerfile.manifest-only-connector
@@ -26,6 +26,8 @@ RUN cp manifest.yaml ./source_declarative_manifest/manifest.yaml
 # Copy components.py if it exists (optional)
 RUN if [ -f components.py ]; then cp components.py ./source_declarative_manifest/components.py; fi
 
-# Set entrypoint explicitly as required for manifest-only connectors
-ENV AIRBYTE_ENTRYPOINT="python ./main.py"
-ENTRYPOINT ["python", "./main.py"]
+# Set user and entrypoint explicitly
+# This is the same as defined in the source-declarative-manifest base image
+USER airbyte
+ENV AIRBYTE_ENTRYPOINT="python /airbyte/integration_code/main.py"
+ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]