diff --git a/Dockerfile.rewriter b/Dockerfile.rewriter
index 5487f722f6ce0a3ecf3399ac7a04c6958bee3d39..5d35ec3bc854628701080f88b31af43f97a3d9c4 100644
--- a/Dockerfile.rewriter
+++ b/Dockerfile.rewriter
@@ -14,8 +14,8 @@ ARG GIT_LAST_COMMITTER
 ARG GIT_LAST_COMMIT_DATE
 LABEL org.opencontainers.image.created="$BUILD_TIME"
 LABEL org.opencontainers.image.url="https://hive.io/"
-LABEL org.opencontainers.image.documentation="https://gitlab.syncad.com/Ickiewicz/hivesens"
-LABEL org.opencontainers.image.source="https://gitlab.syncad.com/Ickiewicz/hivesens"
+LABEL org.opencontainers.image.documentation="https://gitlab.syncad.com/hive/hivesense"
+LABEL org.opencontainers.image.source="https://gitlab.syncad.com/hive/hivesense"
 #LABEL org.opencontainers.image.version="${VERSION}"
 LABEL org.opencontainers.image.revision="$GIT_COMMIT_SHA"
 LABEL org.opencontainers.image.licenses="MIT"
diff --git a/endpoints/endpoint_schema.sql b/endpoints/endpoint_schema.sql
index 61c2cb624f47083227be2ecd07403f8531e6719f..a5b8c6f2e2ac7bfe554f263786a48ecf2cbaaafa 100644
--- a/endpoints/endpoint_schema.sql
+++ b/endpoints/endpoint_schema.sql
@@ -12,7 +12,7 @@ info:
   version: 1.27.8
 externalDocs:
   description: Hivesense gitlab repository
-  url: https://gitlab.syncad.com/Ickiewicz/hivesens
+  url: https://gitlab.syncad.com/hive/hivesense
 tags:
   - name: AI
     description: AI methods to browse Hive social data
@@ -51,7 +51,7 @@ DO $__$
   },
   "externalDocs": {
     "description": "Hivesense gitlab repository",
-    "url": "https://gitlab.syncad.com/Ickiewicz/hivesens"
+    "url": "https://gitlab.syncad.com/hive/hivesense"
   },
   "tags": [
     {
diff --git a/readme.md b/readme.md
index 725634d3767492a3eec714d9183cb08ac0d485c1..826c6a2fd5233fcb40405ceb18d6f67636fbb12f 100644
--- a/readme.md
+++ b/readme.md
@@ -285,7 +285,7 @@ add hivesense to `COMPOSE_PROFILES` variable in th `.env` file. To customize set
    ./scripts/build_haf_ai_image.sh
    ```
 
-   The script will build an image `registry.gitlab.syncad.com/ickiewicz/hivesens/haf/ai-instance:<HAF image tag>`. THe HiveSense can
+   The script will build an image `registry.gitlab.syncad.com/hive/hivesense/haf/ai-instance:<HAF image tag>`. THe HiveSense can
    be deployed only on `ai-instance` HAF.
 2. Build HiveSense docker image.
 
@@ -296,15 +296,15 @@ add hivesense to `COMPOSE_PROFILES` variable in th `.env` file. To customize set
    The script will build hivesense and its query rewriter images:
 
    ```bash
-   registry.gitlab.syncad.com/ickiewicz/hivesens:<8 digit git sha>
-   registry.gitlab.syncad.com/ickiewicz/hivesens/rewiter:<8 digit git sha>
+   registry.gitlab.syncad.com/hive/hivesense:<8 digit git sha>
+   registry.gitlab.syncad.com/hive/hivesense/rewiter:<8 digit git sha>
    ```
 
    With using switch '--push' new images will also be pushed to registry
 3. Run hivesense container
 
    ```bash
-   docker run registry.gitlab.syncad.com/ickiewicz/hivesens:<8 digit git sha> (install_app|process_blocks|uninstall_app)
+   docker run registry.gitlab.syncad.com/hive/hivesense:<8 digit git sha> (install_app|process_blocks|uninstall_app)
    ```
 
    Possible options starts scripts explained  in the pragraph below
diff --git a/scripts/build_haf_ai_image.sh b/scripts/build_haf_ai_image.sh
index e9699cb75402c6c25a3df6b28774fdaec33cedcb..6ed27f787b68750b8f730ca66afa617ae01ad1bd 100755
--- a/scripts/build_haf_ai_image.sh
+++ b/scripts/build_haf_ai_image.sh
@@ -11,7 +11,7 @@ SRCROOTDIR="${SCRIPTSDIR}"
 REGISTRY="${CI_REGISTRY:-registry.gitlab.syncad.com}"
 REGISTRY="${REGISTRY}/hive/"
 
-HAF_AI_INSTANCE_REGISTRY="registry.gitlab.syncad.com/ickiewicz/hivesens/haf/"
+HAF_AI_INSTANCE_REGISTRY="registry.gitlab.syncad.com/hive/hivesense/haf/"
 
 
 HAF_SUBMODULE_SHA=$(git -C submodules/haf describe --tags --exact-match HEAD 2>/dev/null || git -C submodules/haf rev-parse --short=8 HEAD)
diff --git a/scripts/build_images.sh b/scripts/build_images.sh
index 45ddc427313b773531d9f8e67870dc26687728e5..d501a5c5513803865fbca338b508d18ca9187904 100755
--- a/scripts/build_images.sh
+++ b/scripts/build_images.sh
@@ -50,13 +50,13 @@ set -eu pipefail
 
 SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 
-docker build -t "registry.gitlab.syncad.com/ickiewicz/hivesens:${TAG}" "${SCRIPTPATH}/.."
-docker build -t "registry.gitlab.syncad.com/ickiewicz/hivesens/rewiter:${TAG}" -f "${SCRIPTPATH}/../Dockerfile.rewriter"  "${SCRIPTPATH}/.."
+docker build -t "registry.gitlab.syncad.com/hive/hivesense:${TAG}" "${SCRIPTPATH}/.."
+docker build -t "registry.gitlab.syncad.com/hive/hivesense/rewiter:${TAG}" -f "${SCRIPTPATH}/../Dockerfile.rewriter"  "${SCRIPTPATH}/.."
 
 echo "Build images tag ${TAG}"
 
 if [ -n "${PUSH:-}" ]; then
-  docker push "registry.gitlab.syncad.com/ickiewicz/hivesens:${TAG}"
-  docker push "registry.gitlab.syncad.com/ickiewicz/hivesens/rewiter:${TAG}"
+  docker push "registry.gitlab.syncad.com/hive/hivesense:${TAG}"
+  docker push "registry.gitlab.syncad.com/hive/hivesense/rewiter:${TAG}"
   echo "Pushed images tag ${TAG}"
 fi
diff --git a/scripts/ci-helpers/compose_variables.sh b/scripts/ci-helpers/compose_variables.sh
index 2bd9bd6826584e82071491f3dcaf0555757a679c..afe870f831703a6ffdb19a6f882acb1ba5f54ce8 100644
--- a/scripts/ci-helpers/compose_variables.sh
+++ b/scripts/ci-helpers/compose_variables.sh
@@ -26,16 +26,16 @@ HIVE_API_NODE_REGISTRY="registry.gitlab.syncad.com/hive"
 PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME:-"localhost"}
 
 # HAF and Hivemind
-HAF_IMAGE="registry.gitlab.syncad.com/ickiewicz/hivesens/haf/ai-instance"
+HAF_IMAGE="registry.gitlab.syncad.com/hive/hivesense/haf/ai-instance"
 HAF_VERSION="$HAF_SUBMODULE_SHA"
 ARGUMENTS="--replay-blockchain --block-stats-report-output=NOTIFY --block-stats-report-type=FULL --notifications-endpoint=hived-pme:9185 --stop-at-block=${NUMBER_OF_BLOCKS_TO_SYNC}"
 HIVEMIND_VERSION="$HIVEMIND_NODE_SUBMODULE_SHA"
 HIVEMIND_SYNC_ARGS="--test-max-block=${NUMBER_OF_BLOCKS_TO_SYNC}"
 
 # Hivesense
-HIVESENSE_IMAGE="registry.gitlab.syncad.com/ickiewicz/hivesens"
+HIVESENSE_IMAGE="registry.gitlab.syncad.com/hive/hivesense"
 HIVESENSE_VERSION="$HIVESENSE_TAG"
-HIVESENSE_REWRITER_IMAGE="registry.gitlab.syncad.com/ickiewicz/hivesens/rewiter"
+HIVESENSE_REWRITER_IMAGE="registry.gitlab.syncad.com/hive/hivesense/rewiter"
 
 HIVESENSE_SYNC_ARGS="--stop-at-block=${NUMBER_OF_BLOCKS_TO_SYNC}"