diff --git a/Makefile b/Makefile
index 7ad6e2c41..e60d9cb3c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION ?= 0.7.0-dev
+VERSION ?= 0.6.6
 CONTAINER_MANAGER ?= podman
 # Image URL to use all building/pushing image targets
 IMG ?= quay.io/redhat-developer/mapt:v${VERSION}
diff --git a/docs/aws.md b/docs/aws.md
index 31e2015a5..75153731a 100644
--- a/docs/aws.md
+++ b/docs/aws.md
@@ -33,7 +33,7 @@ Current information about supported machines can be checked at [support-matrix](
 It creates / destroy supported hosts ready to be included within the CI/CD system. Features included within the offering:
 
 ```bash
-podman run -it --rm quay.io/redhat-developer/mapt:0.7.0-dev aws host create -h
+podman run -it --rm quay.io/redhat-developer/mapt:0.6.6 aws host create -h
 create
 
 Usage:
@@ -72,7 +72,7 @@ podman run -d --name mapt-rhel \
         -e AWS_ACCESS_KEY_ID=XXX \
         -e AWS_SECRET_ACCESS_KEY=XXX \
         -e AWS_DEFAULT_REGION=us-east-1 \
-        quay.io/redhat-developer/mapt:0.7.0-dev aws host create \
+        quay.io/redhat-developer/mapt:0.6.6 aws host create \
             --project-name mapt-rhel \
             --backed-url file:///workspace \
             --conn-details-output /workspace \
@@ -92,7 +92,7 @@ podman run -d --name mapt-rhel \
         -e AWS_ACCESS_KEY_ID=XXX \
         -e AWS_SECRET_ACCESS_KEY=XXX \
         -e AWS_DEFAULT_REGION=us-east-1 \
-        quay.io/redhat-developer/mapt:0.7.0-dev aws host destroy \
+        quay.io/redhat-developer/mapt:0.6.6 aws host destroy \
             --project-name mapt-rhel \
             --backed-url file:///workspace 
 ```
diff --git a/docs/aws/fedora.md b/docs/aws/fedora.md
index 16faac0a8..fa7177b34 100644
--- a/docs/aws/fedora.md
+++ b/docs/aws/fedora.md
@@ -48,7 +48,7 @@ podman run -d --name mapt-rhel \
         -e AWS_ACCESS_KEY_ID=XXX \
         -e AWS_SECRET_ACCESS_KEY=XXX \
         -e AWS_DEFAULT_REGION=us-east-1 \
-        quay.io/redhat-developer/mapt:0.7.0-dev aws fedora create \
+        quay.io/redhat-developer/mapt:0.6.6 aws fedora create \
             --project-name mapt-fedora \
             --backed-url file:///workspace \
             --conn-details-output /workspace
diff --git a/docs/aws/mac.md b/docs/aws/mac.md
index bde624caa..2d36ec643 100644
--- a/docs/aws/mac.md
+++ b/docs/aws/mac.md
@@ -69,7 +69,7 @@ podman run -d --name mapt-rhel \
         -e AWS_ACCESS_KEY_ID=XXX \
         -e AWS_SECRET_ACCESS_KEY=XXX \
         -e AWS_DEFAULT_REGION=us-east-1 \
-        quay.io/redhat-developer/mapt:0.7.0-dev aws mac create \
+        quay.io/redhat-developer/mapt:0.6.6 aws mac create \
             --project-name mapt-mac \
             --backed-url file:///workspace \
             --conn-details-output /workspace
diff --git a/docs/aws/rhel.md b/docs/aws/rhel.md
index 517ae5168..9c4a6dfe0 100644
--- a/docs/aws/rhel.md
+++ b/docs/aws/rhel.md
@@ -53,7 +53,7 @@ podman run -d --name mapt-rhel \
         -e AWS_ACCESS_KEY_ID=XXX \
         -e AWS_SECRET_ACCESS_KEY=XXX \
         -e AWS_DEFAULT_REGION=us-east-1 \
-        quay.io/redhat-developer/mapt:0.7.0-dev aws rhel create \
+        quay.io/redhat-developer/mapt:0.6.6 aws rhel create \
             --project-name mapt-rhel \
             --backed-url file:///workspace \
             --rh-subscription-password XXXX \
diff --git a/docs/aws/windows.md b/docs/aws/windows.md
index 8e34c6ea6..17c9a79b4 100644
--- a/docs/aws/windows.md
+++ b/docs/aws/windows.md
@@ -72,7 +72,7 @@ podman run -d --name mapt-rhel \
         -e AWS_ACCESS_KEY_ID=XXX \
         -e AWS_SECRET_ACCESS_KEY=XXX \
         -e AWS_DEFAULT_REGION=us-east-1 \
-        quay.io/redhat-developer/mapt:0.7.0-dev aws windows create \
+        quay.io/redhat-developer/mapt:0.6.6 aws windows create \
             --project-name mapt-windows \
             --backed-url file:///workspace \
             --conn-details-output /workspace
diff --git a/docs/azure.md b/docs/azure.md
index 648b2d54b..822f0f7f3 100644
--- a/docs/azure.md
+++ b/docs/azure.md
@@ -30,7 +30,7 @@ Side note: the other requirements for reboot are done by default; hyper-v instal
 This will create a windows desktop accordig to params specificed:
 
 ```bash
-podman run -it --rm quay.io/redhat-developer/mapt:0.7.0-dev azure windows create -h
+podman run -it --rm quay.io/redhat-developer/mapt:0.6.6 azure windows create -h
 create
 
 Usage:
@@ -76,7 +76,7 @@ podman run -d --rm \
     -e ARM_SUBSCRIPTION_ID=${asi_value} \
     -e ARM_CLIENT_ID=${aci_value} \
     -e ARM_CLIENT_SECRET=${acs_lue} \
-    quay.io/redhat-developer/mapt:0.7.0-dev azure \
+    quay.io/redhat-developer/mapt:0.6.6 azure \
         windows create \
         --project-name "win-desk-11" \
         --backed-url "file:///workspace" \
@@ -94,7 +94,7 @@ podman run -d --rm \
     -e ARM_SUBSCRIPTION_ID=${asi_value} \
     -e ARM_CLIENT_ID=${aci_value} \
     -e ARM_CLIENT_SECRET=${acs_lue} \
-    quay.io/redhat-developer/mapt:0.7.0-dev azure \
+    quay.io/redhat-developer/mapt:0.6.6 azure \
         windows destroy \
         --project-name "win-desk-11" \
         --backed-url "file:///workspace"
diff --git a/tkn/infra-aws-fedora.yaml b/tkn/infra-aws-fedora.yaml
index 74bb15f88..7b9640174 100644
--- a/tkn/infra-aws-fedora.yaml
+++ b/tkn/infra-aws-fedora.yaml
@@ -4,7 +4,7 @@ kind: Task
 metadata:
   name: infra-aws-fedora
   labels:
-    app.kubernetes.io/version: "0.7.0-dev"
+    app.kubernetes.io/version: "0.6.6"
   annotations:
     tekton.dev/pipelines.minVersion: "0.24.x"
     tekton.dev/categories: infrastructure
@@ -77,7 +77,7 @@ spec:
 
   steps:
   - name: provisioner
-    image: quay.io/redhat-developer/mapt:v0.7.0-dev
+    image: quay.io/redhat-developer/mapt:v0.6.6
     imagePullPolicy: Always
     script: |
       #!/bin/sh
diff --git a/tkn/infra-aws-mac.yaml b/tkn/infra-aws-mac.yaml
index 5e130f8e7..478cea59c 100644
--- a/tkn/infra-aws-mac.yaml
+++ b/tkn/infra-aws-mac.yaml
@@ -4,7 +4,7 @@ kind: Task
 metadata:
   name: infra-aws-mac
   labels:
-    app.kubernetes.io/version: "0.7.0-dev"
+    app.kubernetes.io/version: "0.6.6"
   annotations:
     tekton.dev/pipelines.minVersion: "0.24.x"
     tekton.dev/categories: infrastructure
@@ -96,7 +96,7 @@ spec:
 
   steps:
   - name: provisioner
-    image: quay.io/redhat-developer/mapt:v0.7.0-dev
+    image: quay.io/redhat-developer/mapt:v0.6.6
     imagePullPolicy: Always
     script: |
       #!/bin/sh
diff --git a/tkn/infra-aws-rhel.yaml b/tkn/infra-aws-rhel.yaml
index 8bbdb6769..ee4398f63 100644
--- a/tkn/infra-aws-rhel.yaml
+++ b/tkn/infra-aws-rhel.yaml
@@ -4,7 +4,7 @@ kind: Task
 metadata:
   name: infra-aws-rhel
   labels:
-    app.kubernetes.io/version: "0.7.0-dev"
+    app.kubernetes.io/version: "0.6.6"
   annotations:
     tekton.dev/pipelines.minVersion: "0.24.x"
     tekton.dev/categories: infrastructure
@@ -81,7 +81,7 @@ spec:
 
   steps:
   - name: provisioner
-    image: quay.io/redhat-developer/mapt:v0.7.0-dev
+    image: quay.io/redhat-developer/mapt:v0.6.6
     imagePullPolicy: Always
     script: |
       #!/bin/sh
diff --git a/tkn/infra-aws-windows-server.yaml b/tkn/infra-aws-windows-server.yaml
index 1c945262a..6ed331323 100644
--- a/tkn/infra-aws-windows-server.yaml
+++ b/tkn/infra-aws-windows-server.yaml
@@ -4,7 +4,7 @@ kind: Task
 metadata:
   name: infra-aws-windows-server
   labels:
-    app.kubernetes.io/version: "0.7.0-dev"
+    app.kubernetes.io/version: "0.6.6"
   annotations:
     tekton.dev/pipelines.minVersion: "0.24.x"
     tekton.dev/categories: infrastructure
@@ -86,7 +86,7 @@ spec:
 
   steps:
   - name: provisioner
-    image: quay.io/redhat-developer/mapt:v0.7.0-dev
+    image: quay.io/redhat-developer/mapt:v0.6.6
     imagePullPolicy: Always
     script: |
       #!/bin/sh
diff --git a/tkn/infra-azure-windows-desktop.yaml b/tkn/infra-azure-windows-desktop.yaml
index c3ff2d2a5..bb7693804 100644
--- a/tkn/infra-azure-windows-desktop.yaml
+++ b/tkn/infra-azure-windows-desktop.yaml
@@ -4,7 +4,7 @@ kind: Task
 metadata:
   name: infra-azure-windows-desktop
   labels:
-    app.kubernetes.io/version: "0.7.0-dev"
+    app.kubernetes.io/version: "0.6.6"
   annotations:
     tekton.dev/pipelines.minVersion: "0.24.x"
     tekton.dev/categories: infrastructure
@@ -62,7 +62,7 @@ spec:
 
   steps:
   - name: provisioner
-    image: quay.io/redhat-developer/mapt:v0.7.0-dev
+    image: quay.io/redhat-developer/mapt:v0.6.6
     imagePullPolicy: Always
     script: |
       #!/bin/sh