diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb8f992..9ef8052 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,9 +12,9 @@ build:
   variables:
     STORAGE_DRIVER: vfs
     BUILDAH_FORMAT: docker
-    FQ_IMAGE_NAME: "$REGISTRY/$REGISTRY_USER/$CI_PROJECT_NAME"
+    FQ_IMAGE_NAME: "registry.yaemiku.dev/yaemiku/$CI_PROJECT_NAME"
   before_script:
-    - buildah login -u $REGISTRY_USERNAME -p $REGISTRY_PASSWORD $REGISTRY
+    - echo $REGISTRY_PASSWORD | buildah login -u yaemiku --password-stdin registry.yaemiku.dev
   script:
     - buildah images
     - buildah build -t $FQ_IMAGE_NAME -t $FQ_IMAGE_NAME:$CI_COMMIT_TAG
@@ -23,7 +23,7 @@ build:
   after_script:
     - buildah logout
   rules:
-    - if: $CI_COMMIT_TAG  
+    - if: $CI_COMMIT_TAG
 
 deploy:
   stage: deploy