diff --git a/buildspec.yml b/buildspec.yml
index bb64e4b..aeddece 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -5,8 +5,10 @@ env:
   secrets-manager:
     DOCKERHUB_PASS: "/dockerhub/credentials:password"
     DOCKERHUB_USERNAME: "/dockerhub/credentials:username"
-    exported-variables:
-      - VERSION
+  variables:
+    VERSION: $(cat version.txt)
+  exported-variables:
+    - VERSION
 phases:
     install:
         commands:
@@ -15,17 +17,14 @@ phases:
         commands:
             - echo Logging in to DOCKER...
             - docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASS
-            #- $(aws ecr get-login --no-include-email --region $AWS_DEFAULT_REGION)
     build:
         commands:
             - echo Build started on `date`
             - echo Building the Docker image...          
-            - docker build -t $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG .
-            - docker tag $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG
-            #- docker tag $IMAGE_REPO_NAME:$IMAGE_TAG $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_REPO_NAME:$IMAGE_TAG      
+            - docker build -t $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION .
+            - docker tag $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG
     post_build:
         commands:
             - echo Build completed on `date`
             - echo Pushing the Docker image...
-            - docker push $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG
-            #- docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_REPO_NAME:$IMAGE_TAG
+            - docker push $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG