diff --git a/buildspec.yml b/buildspec.yml
index 866e4f3..5d24bb3 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -1,13 +1,9 @@
 version: 0.2
 
 env:
-  variables:
-    COLUMNS: 80
   parameter-store:
     LOGIN_PASSWORD: /dotbare/dockerpassword
     LOGIN_USERNAME: /dotbare/dockerusername
-  exported-variables:
-    - COLUMNS
 
 phases:
   install:
@@ -33,8 +29,9 @@ phases:
       - docker container run -i --rm --name dotbare kazhala/dotbare:testbare
       - echo Building docker image ...
       - |-
-        DOTBARE_VERSION=$(./dotbare --version | awk -F ': v" '{print $2}')
-      - docker image build -t kazhala/dotbare:latest -t kazhala/fzfaws:$DOTBARE_VERSION .
+        DOTBARE_VERSION=$(./dotbare --version | awk -F ": v" '{print $2}')
+      - docker image build -t kazhala/dotbare:$DOTBARE_VERSION .
+      - docker image tag kazhala/dotbare:$DOTBARE_VERSION kazhala/dotbare:latest
   post_build:
     commands:
       - echo Deploying docker image ...
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 301ea5c..1f6ba75 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -1,6 +1,7 @@
 FROM bats/bats:latest
 RUN apk add --no-cache git
 RUN apk add --no-cache fzf
+ENV COLUMNS=80
 ADD ./ /root/dotbare
 RUN echo "source /root/dotbare/dotbare.plugin.bash" >> "$HOME"/.bashrc
 WORKDIR /root/dotbare