diff --git a/Dockerfile b/Dockerfile
index 4048139..98ae323 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,7 +38,7 @@ RUN apt-get update \
     && apt-get install -y python3-venv \
     && make acceptance
 
-FROM codefresh/kube-helm:${HELM_VERSION}
+FROM codefresh/kube-helm-debian:${HELM_VERSION}
 
 ENV XDG_CACHE_HOME=/root/.helm
 ENV XDG_DATA_HOME=/root/.helm
@@ -54,8 +54,7 @@ COPY lib/* /opt/lib/
 COPY build_entrypoint_script /opt/build_entrypoint_script
 
 # Install Python3
-RUN apk add --no-cache python3 \
-    && rm -rf /root/.cache
+RUN rm -rf /root/.cache
 
 ENV HELM_VERSION ${HELM_VERSION}
 
diff --git a/Dockerfile.helm2 b/Dockerfile.helm2
index e9bf282..c4e9e25 100644
--- a/Dockerfile.helm2
+++ b/Dockerfile.helm2
@@ -27,7 +27,7 @@ RUN apt-get update \
     && apt-get install -y python3-venv \
     && make acceptance
 
-FROM codefresh/kube-helm:${HELM_VERSION}
+FROM codefresh/kube-helm-debian:${HELM_VERSION}
 ARG HELM_VERSION
 COPY --from=setup /temp /root/.helm/* /root/.helm/
 COPY bin/* /opt/bin/
@@ -36,9 +36,8 @@ COPY lib/* /opt/lib/
 COPY build_entrypoint_script /opt/build_entrypoint_script
 
 # Install Python3
-RUN apk add --no-cache python3 \
-    && rm -rf /root/.cache
+RUN rm -rf /root/.cache
 
 ENV HELM_VERSION ${HELM_VERSION}
 
-ENTRYPOINT ["/opt/bin/release_chart"]
\ No newline at end of file
+ENTRYPOINT ["/opt/bin/release_chart"]
diff --git a/Makefile b/Makefile
index af80fbc..2775e15 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-ACCEPTANCE_PY_REQUIRES = robotframework==3.0.4
+ACCEPTANCE_PY_REQUIRES = robotframework==6.0.2
 
 .PHONY: acceptance
 acceptance:
diff --git a/codefresh-helm3.yml b/codefresh-helm3.yml
index 239bb57..05b0b8a 100644
--- a/codefresh-helm3.yml
+++ b/codefresh-helm3.yml
@@ -4,31 +4,58 @@ steps:
   define_the_versions_list:
     image: alpine
     commands:
+      # already built versions:
+      # 3.0.0
+      # 3.0.1
+      # 3.0.2
+      # 3.0.3
+      # 3.1.0
+      # 3.1.1
+      # 3.1.2
+      # 3.1.3
+      # 3.2.0
+      # 3.2.1
+      # 3.2.2
+      # 3.2.3
+      # 3.2.4
+      # 3.3.1
+      # 3.4.1
+      # 3.5.2
+      # 3.6.0
+      # 3.6.1
+      # 3.6.2
+      # 3.7.0
+      # 3.7.1
+      # 3.7.2
+      # 3.8.0
+      # 3.9.0
+      # 3.9.1
+      # 3.9.2
+      # 3.9.3
+      # 3.9.4
+      # 3.10.0
+      # 3.10.1
+      # 3.10.2
+      # 3.10.3
+      # 3.11.0
+      # 3.11.1
+      # 3.11.2
+      # 3.11.3
+      # 3.12.0
+      # 3.12.1
+      # 3.12.2
+      # 3.12.3
+      # 3.13.0
+      # 3.13.1
       - |-
         cat <<EOF > helmVersionsList 
-        3.0.0
-        3.0.1
-        3.0.2
-        3.0.3
-        3.1.0
-        3.1.1
-        3.1.2
-        3.1.3
-        3.2.0
-        3.2.1
-        3.2.2
-        3.2.3
-        3.2.4
-        3.3.1
-        3.4.1
-        3.5.2
-        3.6.0
-        3.6.1
-        3.6.2
-        3.7.0
-        3.7.1
-        3.7.2
-        3.8.0
+        3.13.2
+        3.13.3
+        3.14.0
+        3.14.1
+        3.14.2
+        3.14.3
+        3.14.4
     when:
       condition:
         all:
@@ -64,7 +91,7 @@ steps:
     type: build
     registry: dockerhub
     working_directory: '${{clone}}'
-    image_name: '${{STEP_IMAGE}}'
+    image_name: '${{STEP_IMAGE}}-debian'
     tag: '${{HELM_VERSION}}-${{CF_SHORT_REVISION}}'
     build_arguments:
       - 'HELM_VERSION=${{HELM_VERSION}}'
@@ -84,12 +111,12 @@ steps:
       condition:
         all:
           recursivelyInvoked: 'includes("${{HELM_VERSION}}", "${{") == false'
-          masterBranch: 'match("${{CF_BRANCH}}", "^master", true) == true'
+          masterBranch: 'match("${{CF_BRANCH}}", "^debian", true) == true'
     scale:
       PushToDockerHub:
         registry: dockerhub
       PushToQuay:
-        image_name: "codefreshplugins/cfstep-helm"
+        image_name: "codefreshplugins/cfstep-helm-debian"
         tag: ${{HELM_VERSION}}
         candidate: ${{build_image}}
         registry: quay
diff --git a/codefresh.yml b/codefresh.yml
index 90804b3..53eedda 100644
--- a/codefresh.yml
+++ b/codefresh.yml
@@ -59,7 +59,7 @@ steps:
   build_image:
     type: build
     working_directory: '${{clone}}'
-    image_name: '${{STEP_IMAGE}}'
+    image_name: '${{STEP_IMAGE}}-debian'
     tag: '${{HELM_VERSION}}-${{CF_SHORT_REVISION}}'
     build_arguments:
       - 'HELM_VERSION=${{HELM_VERSION}}'
@@ -91,4 +91,4 @@ steps:
       condition:
         all:
           latestHelmVersion: "'${{HELM_VERSION}}' == '${{LATEST_VERSION}}'"
-          masterBranch: "'${{CF_BRANCH}}' == 'master'"
\ No newline at end of file
+          masterBranch: "'${{CF_BRANCH}}' == 'debian'"