diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml
index c4a76eb..452c958 100644
--- a/.github/workflows/housekeeping.yml
+++ b/.github/workflows/housekeeping.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Delete old releases
         uses: snok/container-retention-policy@v2
         with:
-          image-names: aimaas/api, aimaas/ui
+          image-names: aimaas/aimaas-api, aimaas/aimaas-ui
           cut-off: one month ago UTC
           timestamp-to-use: updated_at
           account-type: org
diff --git a/.github/workflows/on_tag.yml b/.github/workflows/on_tag.yml
index ac7447d..8f13b0c 100644
--- a/.github/workflows/on_tag.yml
+++ b/.github/workflows/on_tag.yml
@@ -19,10 +19,10 @@ jobs:
         id: image
         run: |
           docker build backend/ \
-            --tag ghcr.io/${GITHUB_REPOSITORY,,}/api:${GITHUB_REF_NAME,,} \
-            --tag ghcr.io/${GITHUB_REPOSITORY,,}/api:latest
-          docker push ghcr.io/${GITHUB_REPOSITORY,,}/api:${GITHUB_REF_NAME,,}
-          docker push ghcr.io/${GITHUB_REPOSITORY,,}/api:latest
+            --tag ghcr.io/${GITHUB_REPOSITORY,,}/aimaas-api:${GITHUB_REF_NAME,,} \
+            --tag ghcr.io/${GITHUB_REPOSITORY,,}/aimaas-api:latest
+          docker push ghcr.io/${GITHUB_REPOSITORY,,}/aimaas-api:${GITHUB_REF_NAME,,}
+          docker push ghcr.io/${GITHUB_REPOSITORY,,}/aimaas-api:latest
   build-ui:
     runs-on: ubuntu-latest
     steps:
@@ -37,10 +37,10 @@ jobs:
       - name: 'Build UI image'
         run: |
           docker build frontend/ \
-            --tag ghcr.io/${GITHUB_REPOSITORY,,}/ui:${GITHUB_REF_NAME,,} \
-            --tag ghcr.io/${GITHUB_REPOSITORY,,}/ui:latest
-          docker push ghcr.io/${GITHUB_REPOSITORY,,}/ui:${GITHUB_REF_NAME,,}
-          docker push ghcr.io/${GITHUB_REPOSITORY,,}/ui:latest
+            --tag ghcr.io/${GITHUB_REPOSITORY,,}/aimaas-ui:${GITHUB_REF_NAME,,} \
+            --tag ghcr.io/${GITHUB_REPOSITORY,,}/aimaas-ui:latest
+          docker push ghcr.io/${GITHUB_REPOSITORY,,}/aimaas-ui:${GITHUB_REF_NAME,,}
+          docker push ghcr.io/${GITHUB_REPOSITORY,,}/aimaas-ui:latest
   test-api:
     needs: build-api
     runs-on: ubuntu-latest
@@ -61,7 +61,7 @@ jobs:
           docker run --rm --network host -e PG_USER=$PG_USER -e PG_PASSWORD=$PG_PASSWORD \
             -e PG_HOST=$PG_HOST -e PG_PORT=$PG_PORT -e PG_DB=$PG_DB --entrypoint "" \
             -v `pwd`:/src \
-            ghcr.io/${GITHUB_REPOSITORY,,}/api:${GITHUB_REF_NAME,,} \
+            ghcr.io/${GITHUB_REPOSITORY,,}/aimaas-api:${GITHUB_REF_NAME,,} \
             bash -c 'pip3 install -r /src/backend/requirements_test.txt; pytest /opt/aimaas/backend/tests/'
         env:
           PG_USER: aimaas