diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 310b256c..3cbb92b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,8 +23,8 @@ jobs:
         run: |
           TAG=$(git describe --tags --abbrev=0)
 
-          docker build cyclops-ui -t petarcvit223/cyclops-ui:$TAG
-          docker push petarcvit223/cyclops-ui:$TAG
+          docker build cyclops-ui -t cyclops-ui/cyclops-ui:$TAG
+          docker push cyclops-ui/cyclops-ui:$TAG
 
   build-controller:
     runs-on: ubuntu-latest
@@ -40,8 +40,8 @@ jobs:
         run: |
           TAG=$(git describe --tags --abbrev=0)
 
-          docker build cyclops-ctrl -t petarcvit223/cyclops-ctrl:$TAG
-          docker push petarcvit223/cyclops-ctrl:$TAG
+          docker build cyclops-ctrl -t cyclops-ui/cyclops-ctrl:$TAG
+          docker push cyclops-ui/cyclops-ctrl:$TAG
 
   update-install-manifest:
     runs-on: ubuntu-latest
@@ -52,8 +52,8 @@ jobs:
           TAG=$(git describe --tags --abbrev=0)
           INSTALL_YAML=$GITHUB_WORKSPACE/install/cyclops-install.yaml
 
-          sed -i 's/petarcvit223\/cyclops-ctrl\:.*/petarcvit223\/cyclops-ctrl\:'$TAG'/' $INSTALL_YAML
-          sed -i 's/petarcvit223\/cyclops-ui\:.*/petarcvit223\/cyclops-ui\:'$TAG'/' $INSTALL_YAML
+          sed -i 's/cyclops-ui\/cyclops-ctrl\:.*/cyclops-ui\/cyclops-ctrl\:'$TAG'/' $INSTALL_YAML
+          sed -i 's/cyclops-ui\/cyclops-ui\:.*/cyclops-ui\/cyclops-ui\:'$TAG'/' $INSTALL_YAML
 
           # update file
           git config --global user.email "petar.cvitanovic@gmail.com"
diff --git a/install/cyclops-install.yaml b/install/cyclops-install.yaml
index d37846e2..6d806fc3 100644
--- a/install/cyclops-install.yaml
+++ b/install/cyclops-install.yaml
@@ -271,7 +271,7 @@ spec:
     spec:
       containers:
         - name: cyclops-ui
-          image: petarcvit223/cyclops-ui:v0.16.0
+          image: cyclopsui/cyclops-ui:v0.16.0
           ports:
             - containerPort: 80
           env:
@@ -317,7 +317,7 @@ spec:
       serviceAccountName: cyclops-ctrl
       containers:
         - name: cyclops-ctrl
-          image: petarcvit223/cyclops-ctrl:v0.16.0
+          image: cyclopsui/cyclops-ctrl:v0.16.0
           ports:
             - containerPort: 8080
           env: