diff --git a/charts/microgateway/README.md b/charts/microgateway/README.md
index 9e9c6a15..75162e0d 100644
--- a/charts/microgateway/README.md
+++ b/charts/microgateway/README.md
@@ -137,8 +137,8 @@ The following table lists configuration parameters of the Airlock Microgateway c
 | hpa.resource.cpu | int | `50` | Average Microgateway CPU consumption in percentage to scale up/down. |
 | hpa.resource.memory | string | `"2Gi"` | Average Microgateway Memory consumption to scale up/down.<br><br> :exclamation: Update this setting accordingly to `resources.limits.memory`. |
 | image.pullPolicy | string | `"Always"` | Pull policy (`Always`, `IfNotPresent`, `Never`) |
-| image.repository | string | `"docker.ergon.ch/airlock/microgateway"` | Image repository |
-| image.tag | string | `"1.0.sprint14_Build012"` | Image tag |
+| image.repository | string | `"ergon/airlock-microgateway"` | Image repository |
+| image.tag | string | `"1.0"` | Image tag |
 | imagePullSecrets | list | `[]` | Reference to one or more secrets to use when pulling images. |
 | ingress | object | See `ingress.*`: | [Kubernetes Ingress](#kubernetes-ingress) |
 | ingress.annotations | object | `{"nginx.ingress.kubernetes.io/rewrite-target":"/"}` | Annotations to set on the ingress. |
diff --git a/charts/microgateway/ci/testing-values.yaml b/charts/microgateway/ci/testing-values.yaml
index d2a19dc7..c3f8842e 100644
--- a/charts/microgateway/ci/testing-values.yaml
+++ b/charts/microgateway/ci/testing-values.yaml
@@ -1,5 +1,3 @@
-image:
-  repository: orltom/microgateway
 config:
   generic:
     existingSecret: "microgatewaysecrets"
diff --git a/charts/microgateway/values.yaml b/charts/microgateway/values.yaml
index 93935f7e..888b9fcf 100644
--- a/charts/microgateway/values.yaml
+++ b/charts/microgateway/values.yaml
@@ -3,9 +3,9 @@ replicaCount: 1
 
 image:
   # image.repository -- Image repository
-  repository: docker.ergon.ch/airlock/microgateway
+  repository: ergon/airlock-microgateway
   # image.tag -- Image tag
-  tag: 1.0.sprint14_Build012
+  tag: "1.0"
   # image.pullPolicy -- Pull policy (`Always`, `IfNotPresent`, `Never`)
   pullPolicy: Always