diff --git a/buildspec.yml b/buildspec.yml
index 2d4be15..8058ea3 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -16,12 +16,12 @@ phases:
         commands:
             - echo Build started on `date`
             - echo Building the Docker image...          
-            - docker build -t chuckcharlie/$IMAGE_REPO_NAME:$IMAGE_TAG .
-            - docker tag chuckcharlie/$IMAGE_REPO_NAME:$IMAGE_TAG chuckcharlie/$IMAGE_REPO_NAME:$IMAGE_TAG
+            - 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      
     post_build:
         commands:
             - echo Build completed on `date`
             - echo Pushing the Docker image...
-            - docker push chuckcharlie/$IMAGE_REPO_NAME:$IMAGE_TAG
+            - 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