diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25ff3c3..cae2bac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,12 +14,14 @@ build:
     BUILDAH_FORMAT: docker
     FQ_IMAGE_NAME: "$REGISTRY/$REGISTRY_USER/$CI_PROJECT_NAME"
   before_script:
-    - echo "$REGISTRY_PASSWORD" | buildah login -u "$REGISTRY_USER" --password-stdin $REGISTRY
+    - buildah login --username "${REGISTRY_USERNAME}" --password "${REGISTRY_PASSWORD}" "${REGISTRY}"
   script:
     - buildah images
     - buildah build -t $FQ_IMAGE_NAME -t $FQ_IMAGE_NAME:$CI_COMMIT_TAG
     - buildah images
     - buildah push -a $FQ_IMAGE_NAME
+  after_script:
+    - buildah logout
   rules:
     - if: $CI_COMMIT_TAG