diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9358fbf..5e323b7 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,11 +18,8 @@ orbs:
       install-halyard:
         steps:
           - run:
-              name: Install hal (debian < 10)
+              name: Install hal
               command: |
-                echo "deb http://deb.debian.org/debian stretch-backports main" \
-                  | sudo tee -a /etc/apt/sources.list.d/stretch-backports.list
-                sudo apt-get update
                 curl -O https://raw.githubusercontent.com/spinnaker/halyard/master/install/debian/InstallHalyard.sh
                 sudo bash InstallHalyard.sh --user $(whoami) -y
       remove-bucket-if-exists:
@@ -80,7 +77,7 @@ parameters:
 
 jobs:
   trigger-integration-tests:
-    executor: spinnaker/default-stretch
+    executor: spinnaker/default
     parameters:
       cluster-name:
         description: |
@@ -100,7 +97,7 @@ jobs:
             }" "https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline"
   # Integration test workflow jobs
   install-spinnaker:
-    executor: spinnaker/default-stretch
+    executor: spinnaker/default
     parameters:
       cluster-name:
         description: |
@@ -238,7 +235,7 @@ jobs:
               --cloud-providers "kubernetes"
             spin pipeline save --file tests/pipeline.json
   test-spinnaker:
-    executor: spinnaker/default-stretch
+    executor: spinnaker/default
     parameters:
       cluster-name:
         description: |
diff --git a/README.md b/README.md
index e9ded68..0c01207 100755
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ jobs:
         description: |
           AWS region that the EKS cluster is in
         type: string
-    executor: spinnaker/default-stretch
+    executor: spinnaker/default
     steps:
       # Set up k8s cluster connection.
       # In this example, Spinnaker is deployed on an AWS EKS k8s cluster.
diff --git a/src/examples/trigger-pipeline-with-webhook.yml b/src/examples/trigger-pipeline-with-webhook.yml
index 740b6ef..dbda9ff 100644
--- a/src/examples/trigger-pipeline-with-webhook.yml
+++ b/src/examples/trigger-pipeline-with-webhook.yml
@@ -20,7 +20,7 @@ usage:
           description: |
             AWS region that the EKS cluster is in
           type: string
-      executor: spinnaker/default-stretch
+      executor: spinnaker/default
       steps:
         # Set up k8s cluster connection.
         # In this example, Spinnaker is deployed on an AWS EKS k8s cluster.
diff --git a/src/executors/default-stretch.yml b/src/executors/default-stretch.yml
deleted file mode 100755
index 3707af8..0000000
--- a/src/executors/default-stretch.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-description: |
-  This is a default executor that is based on Debian Stretch and has
-  Python 3 installed.
-docker:
-  - image: 'circleci/python:<<parameters.tag>>'
-parameters:
-  tag:
-    default: 3-stretch
-    description: |
-      Pick a specific circleci/python image variant:
-      https://hub.docker.com/r/circleci/python/tags
-    type: string
diff --git a/src/executors/default.yml b/src/executors/default.yml
new file mode 100755
index 0000000..5ff5bf3
--- /dev/null
+++ b/src/executors/default.yml
@@ -0,0 +1,11 @@
+description: |
+  This is a default executor providing an Ubuntu based Python image.
+docker:
+  - image: 'cimg/python:<<parameters.tag>>'
+parameters:
+  tag:
+    default: "3.9"
+    description: |
+      Pass a Python version. Available tags can be found here:
+      https://circleci.com/developer/images/image/cimg/python#image-tags
+    type: string