diff --git a/demo/grouper/docker-compose.yml b/demo/grouper/docker-compose.yml
index fd57b8c..2098eed 100644
--- a/demo/grouper/docker-compose.yml
+++ b/demo/grouper/docker-compose.yml
@@ -173,7 +173,7 @@ services:
      - CREATE_NEW_DATABASE=if_needed
 
   data_init:
-    image: tier/midpoint:${tag:-4.4}
+    image: i2incommon/midpoint:${tag:-4.4}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
diff --git a/demo/grouper/midpoint_server/Dockerfile b/demo/grouper/midpoint_server/Dockerfile
index 849ba14..c053fbe 100644
--- a/demo/grouper/midpoint_server/Dockerfile
+++ b/demo/grouper/midpoint_server/Dockerfile
@@ -1,6 +1,6 @@
 ARG tag=4.4
 
-FROM tier/midpoint:${tag}
+FROM i2incommon/midpoint:${tag}
 
 MAINTAINER info@evolveum.com
 
diff --git a/demo/shibboleth/docker-compose-tests.yml b/demo/shibboleth/docker-compose-tests.yml
index 1079d67..a53f33c 100644
--- a/demo/shibboleth/docker-compose-tests.yml
+++ b/demo/shibboleth/docker-compose-tests.yml
@@ -5,7 +5,7 @@ version: "3.3"
 
 services:
   data_init:
-    image: tier/midpoint:${tag:-4.4}
+    image: i2incommon/midpoint:${tag:-4.4}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
diff --git a/demo/shibboleth/docker-compose.yml b/demo/shibboleth/docker-compose.yml
index 3a28814..f7b5064 100644
--- a/demo/shibboleth/docker-compose.yml
+++ b/demo/shibboleth/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.3"
 
 services:
   data_init:
-    image: tier/midpoint:${tag:-4.4}
+    image: i2incommon/midpoint:${tag:-4.4}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
diff --git a/demo/shibboleth/midpoint_server/Dockerfile b/demo/shibboleth/midpoint_server/Dockerfile
index 849ba14..c053fbe 100644
--- a/demo/shibboleth/midpoint_server/Dockerfile
+++ b/demo/shibboleth/midpoint_server/Dockerfile
@@ -1,6 +1,6 @@
 ARG tag=4.4
 
-FROM tier/midpoint:${tag}
+FROM i2incommon/midpoint:${tag}
 
 MAINTAINER info@evolveum.com
 
diff --git a/demo/simple/docker-compose.yml b/demo/simple/docker-compose.yml
index da1aa3f..ae6ee68 100644
--- a/demo/simple/docker-compose.yml
+++ b/demo/simple/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.3"
 
 services:
   data_init:
-    image: tier/midpoint:${tag:-4.4}
+    image: i2incommon/midpoint:${tag:-4.4}
     command: >
         bash -c "
         chmod 777 /opt/mp-pw/ ;
@@ -57,7 +57,7 @@ services:
      - mp_pw:/opt/mp-pw
 
   midpoint_server:
-    image: tier/midpoint:${tag:-4.4}
+    image: i2incommon/midpoint:${tag:-4.4}
     depends_on:
      - data_init
      - midpoint_data