diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 698f196..cb00f6f 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -23,7 +23,7 @@ jobs:
           env:
             ECR_REGISTRY: ${{ steps.login-aws-ecr.outputs.registry }}
             ECR_REPOSITORY: ${{secrets.API_IMAGE_REPO}}
-            IMAGE_TAG: v2
+            IMAGE_TAG: ${{ github.sha}}
           run: |
             docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG ./api
             docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
@@ -47,7 +47,7 @@ jobs:
           env:
             ECR_REGISTRY: ${{ steps.login-aws-ecr.outputs.registry }}
             ECR_REPOSITORY: ${{secrets.FRONTEND_IMAGE_REPO}}
-            IMAGE_TAG: v2
+            IMAGE_TAG: ${{ github.sha}}
           run: |
             docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG ./frontend
             docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
@@ -83,7 +83,7 @@ jobs:
         aws eks update-kubeconfig --name ${{secrets.K8S_CLUSTER_NAME}} --region ${{secrets.AWS_REGION}}
     - name: Install/Update Helm Chart
       run: |
-        helm upgrade --install todo-app ./todo --set database.host=${{secrets.DB_HOST}} --set database.username=${{secrets.DB_USERNAME}} --set database.password=${{secrets.DB_PASSWORD}} --set api.image.repository=${{secrets.API_IMAGE_URI}} --set frontend.image.repository=${{secrets.FRONTEND_IMAGE_URI}}  
+        helm upgrade --install todo-app ./todo --set database.host=${{secrets.DB_HOST}} --set database.username=${{secrets.DB_USERNAME}} --set database.password=${{secrets.DB_PASSWORD}} --set api.image.repository=${{secrets.API_IMAGE_URI}} --set frontend.image.repository=${{secrets.FRONTEND_IMAGE_URI}} --set api.image.tag=${{github.sha}} --set frontend.image.tag=${{github.sha}} 
 
 
 
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 2431b80..eb671a2 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -51,7 +51,7 @@ function App() {
   return (
     <div className="container">
       <div className="card">
-        <h3>What needs to be done? TEST</h3>
+        <h3>What needs to be done? EDIT</h3>
         <div className="form">
           <input
             type="text"
diff --git a/todo/values.yaml b/todo/values.yaml
index 6e76067..87e747b 100644
--- a/todo/values.yaml
+++ b/todo/values.yaml
@@ -12,10 +12,10 @@ environment: production
 api:
   image: 
     repository: ""
-    tag: v2
+    tag: ""
 
 frontend:
   image: 
     repository: ""
-    tag: v2
+    tag: ""