diff --git a/.buildkite/scripts/steps/integration-cloud-image-push.sh b/.buildkite/scripts/steps/integration-cloud-image-push.sh
index 0292c80f6d8..c628d0219eb 100755
--- a/.buildkite/scripts/steps/integration-cloud-image-push.sh
+++ b/.buildkite/scripts/steps/integration-cloud-image-push.sh
@@ -16,6 +16,6 @@ echo "CI_ELASTIC_AGENT_DOCKER_IMAGE: ${CI_ELASTIC_AGENT_DOCKER_IMAGE}"
 
 
 export CUSTOM_IMAGE_TAG="git-${BUILDKITE_COMMIT:0:12}"
-export USE_PACKAGE_VERSION="true"
+export USE_PACKAGE_VERSION="false"
 
 mage cloud:push
diff --git a/.buildkite/scripts/steps/integration-package.sh b/.buildkite/scripts/steps/integration-package.sh
index 0a454d99ded..b0ed54700c2 100755
--- a/.buildkite/scripts/steps/integration-package.sh
+++ b/.buildkite/scripts/steps/integration-package.sh
@@ -11,6 +11,6 @@ source .buildkite/scripts/common.sh
 
 export SNAPSHOT="true"
 export EXTERNAL="true"
-export USE_PACKAGE_VERSION="true"
+export USE_PACKAGE_VERSION="false"
 
 mage package
diff --git a/dev-tools/packaging/files/linux/connectors.sh b/dev-tools/packaging/files/linux/connectors.sh
index 81f95e24372..9511f61f48f 100755
--- a/dev-tools/packaging/files/linux/connectors.sh
+++ b/dev-tools/packaging/files/linux/connectors.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PY_AGENT_CLIENT_PATH=/usr/share/connectors
+PY_AGENT_CLIENT_PATH=/usr/share/connectors/app/connectors_service
 PYTHON_PATH=$PY_AGENT_CLIENT_PATH/.venv/bin/python
 COMPONENT_PATH=$PY_AGENT_CLIENT_PATH/connectors/agent/cli.py
 $PYTHON_PATH $COMPONENT_PATH
diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml
index c9abd9c1ddc..0e0c3f0758e 100644
--- a/dev-tools/packaging/packages.yml
+++ b/dev-tools/packaging/packages.yml
@@ -102,7 +102,7 @@ components:
     # using the beat_version or similar
     # We don't support that yet, so we are defining a rootDir that will error out if rendered. This is not a problem since
     # we don't extract/manipulate the archive during packaging, it has its own special handling in the 'service' docker image
-    rootDir: elasticsearch_connectors-{{beat_version}}
+    rootDir: connectors-{{beat_version}}
     binaryName: connectors
     fips: false
     platforms:
diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
index 90063491adf..968de7318f4 100644
--- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
+++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
@@ -195,8 +195,8 @@ RUN mkdir /app && \
 
 {{- if eq .Variant "service" }}
 RUN apk add --no-cache git make python-3.11 py3.11-pip && \
-    unzip {{ $beatHome }}/data/service/connectors-*.zip -d {{ $beatHome }}/data/service && \
-    mv {{ $beatHome }}/data/service/elasticsearch_connectors-* /usr/share/connectors && \
+    unzip {{ $beatHome }}/data/service/connectors-*.zip -d {{ $beatHome }}/data/service/connectors && \
+    mv {{ $beatHome }}/data/service/connectors /usr/share/connectors && \
     PYTHON=python3.11 make -C /usr/share/connectors clean install install-agent && \
     chmod 0755 {{ $beatHome }}/data/elastic-agent-*/components/connectors
 {{- end }}