diff --git a/execution_environments/context/Containerfile b/execution_environments/context/Containerfile
index e6b317f..a0b7712 100644
--- a/execution_environments/context/Containerfile
+++ b/execution_environments/context/Containerfile
@@ -1,5 +1,6 @@
-ARG EE_BASE_IMAGE="registry.redhat.io/ansible-automation-platform-25/de-supported-rhel8:latest"
+ARG EE_BASE_IMAGE="registry.redhat.io/ansible-automation-platform-25/de-minimal-rhel9:latest"
 ARG PYCMD="/usr/bin/python3"
+ARG PYPKG="python39"
 ARG PKGMGR_PRESERVE_CACHE=""
 ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS=""
 ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS=""
@@ -11,6 +12,7 @@ USER root
 ENV PIP_BREAK_SYSTEM_PACKAGES=1
 ARG EE_BASE_IMAGE
 ARG PYCMD
+ARG PYPKG
 ARG PKGMGR_PRESERVE_CACHE
 ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
 ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
@@ -18,27 +20,19 @@ ARG PKGMGR
 
 COPY _build/scripts/ /output/scripts/
 COPY _build/scripts/entrypoint /opt/builder/bin/entrypoint
-RUN echo This is a prepend base command!
+RUN $PKGMGR install $PYPKG -y ; if [ -z $PKGMGR_PRESERVE_CACHE ]; then $PKGMGR clean all; fi
 RUN /output/scripts/pip_install $PYCMD
 
 # Galaxy build stage
 FROM base as galaxy
 ARG EE_BASE_IMAGE
 ARG PYCMD
+ARG PYPKG
 ARG PKGMGR_PRESERVE_CACHE
 ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
 ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
 ARG PKGMGR
 
-COPY _build/configs/ansible.cfg /etc/ansible/ansible.cfg
-ENV ANSIBLE_GALAXY_SERVER_LIST='certified, validated, community_galaxy'
-ENV ANSIBLE_GALAXY_SERVER_CERTIFIED_URL=https://console.redhat.com/api/automation-hub/content/published/
-ENV ANSIBLE_GALAXY_SERVER_CERTIFIED_AUTH_URL=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
-ENV ANSIBLE_GALAXY_SERVER_VALIDATED_URL=https://console.redhat.com/api/automation-hub/content/validated/
-ENV ANSIBLE_GALAXY_SERVER_VALIDATED_AUTH_URL=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
-ENV ANSIBLE_GALAXY_SERVER_COMMUNITY_GALAXY_URL=https://galaxy.ansible.com/
-ARG ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN
-ARG ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN
 RUN /output/scripts/check_galaxy
 COPY _build /build
 WORKDIR /build
@@ -53,6 +47,7 @@ ENV PIP_BREAK_SYSTEM_PACKAGES=1
 WORKDIR /build
 ARG EE_BASE_IMAGE
 ARG PYCMD
+ARG PYPKG
 ARG PKGMGR_PRESERVE_CACHE
 ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
 ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
@@ -72,6 +67,7 @@ FROM base as final
 ENV PIP_BREAK_SYSTEM_PACKAGES=1
 ARG EE_BASE_IMAGE
 ARG PYCMD
+ARG PYPKG
 ARG PKGMGR_PRESERVE_CACHE
 ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
 ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
diff --git a/execution_environments/context/_build/requirements.yml b/execution_environments/context/_build/requirements.yml
index 9d36d6c..ed81c79 100644
--- a/execution_environments/context/_build/requirements.yml
+++ b/execution_environments/context/_build/requirements.yml
@@ -1,5 +1,2 @@
 collections:
 - name: ansible.eda
-- name: community.general
-- name: redhat.insights_eda
-- name: servicenow.itsm
diff --git a/execution_environments/sthl-ee-eda.yml b/execution_environments/sthl-ee-eda.yml
index 1c38960..241ff77 100644
--- a/execution_environments/sthl-ee-eda.yml
+++ b/execution_environments/sthl-ee-eda.yml
@@ -3,39 +3,14 @@ version: 3
 
 images:
   base_image:
-    name: registry.redhat.io/ansible-automation-platform-25/de-supported-rhel8:latest
+    name: 'registry.redhat.io/ansible-automation-platform-25/de-minimal-rhel9:latest'
 
 dependencies:
   galaxy:
     collections:
       - name: ansible.eda
-      - name: community.general
-      - name: redhat.insights_eda
-      - name: servicenow.itsm
-  system: bindep-eda.txt
-
-additional_build_files:
-  - src: ansible.cfg
-    dest: configs
+  python_interpreter:
+    package_system: "python39"
 
 options:
   package_manager_path: /usr/bin/microdnf
-
-additional_build_steps:
-  prepend_base:
-    - RUN echo This is a prepend base command!
-
-  prepend_galaxy:
-    - COPY _build/configs/ansible.cfg /etc/ansible/ansible.cfg
-    - ENV ANSIBLE_GALAXY_SERVER_LIST='certified, validated, community_galaxy'
-    - ENV ANSIBLE_GALAXY_SERVER_CERTIFIED_URL=https://console.redhat.com/api/automation-hub/content/published/
-    - ENV ANSIBLE_GALAXY_SERVER_CERTIFIED_AUTH_URL=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
-    - ENV ANSIBLE_GALAXY_SERVER_VALIDATED_URL=https://console.redhat.com/api/automation-hub/content/validated/
-    - ENV ANSIBLE_GALAXY_SERVER_VALIDATED_AUTH_URL=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
-    - ENV ANSIBLE_GALAXY_SERVER_COMMUNITY_GALAXY_URL=https://galaxy.ansible.com/
-    # Update environment variables with new token values to regenerate the execution environment
-    # Token can be generated at https://console.redhat.com/ansible/automation-hub/token
-    # Pass both ARGs into Ansible-Builder
-    - ARG ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN
-    - ARG ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN
-