diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index dcac62e..094dbf0 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -8,89 +8,70 @@ on:
     branches:
       - master
       - dev
-      
+
 jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
       packages: write
-      
+    strategy:
+      matrix:
+        component: [frontend, backend]
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-        
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
-    - name: Log in to GHCR
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-        
-    - name: Get Commit Hash
-      id: get_commit_hash
-      run: echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+      - name: Log in to GHCR
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Set Docker Tags
-      id: set_tags
-      run: |
-        if [ "${{ github.ref_name }}" == "master" ]; then
-          echo "tag=latest" >> $GITHUB_ENV
-        elif [ "${{ github.ref_name }}" == "dev" ]; then
-          echo "tag=dev" >> $GITHUB_ENV
-        else
-          echo "Unknown branch: ${{ github.ref_name }}"
-          exit 1
-        fi
-        
-    - name: Build and push frontend Docker image to GHCR
-      uses: docker/build-push-action@v3
-      with:
-        context: ./frontend
-        file: ./frontend/Dockerfile
-        build-args: |
-          COMMIT_HASH=${{ env.hash }}
-        push: true
-        tags: |
-          ghcr.io/loudbooks/pastebook-frontend:${{ env.tag }}
-          ghcr.io/loudbooks/pastebook-frontend:${{ env.hash }}
+      - name: Get Commit Hash
+        id: get_commit_hash
+        run: echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
-    - name: Build and push backend Docker image to GHCR
-      uses: docker/build-push-action@v3
-      with:
-        context: ./backend
-        file: ./backend/Dockerfile
-        push: true
-        tags: |
-          ghcr.io/loudbooks/pastebook-backend:${{ env.tag }}
-          ghcr.io/loudbooks/pastebook-backend:${{ env.hash }}
+      - name: Set Docker Tags
+        id: set_tags
+        run: |
+          if [ "${{ github.ref_name }}" == "master" ]; then
+            echo "tag=latest" >> $GITHUB_ENV
+          elif [ "${{ github.ref_name }}" == "dev" ]; then
+            echo "tag=dev" >> $GITHUB_ENV
+          else
+            echo "Unknown branch: ${{ github.ref_name }}"
+            exit 1
 
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Build and push Docker image to GHCR
+        uses: docker/build-push-action@v3
+        with:
+          context: ./${{ matrix.component }}
+          file: ./${{ matrix.component }}/Dockerfile
+          build-args: |
+            COMMIT_HASH=${{ env.hash }}
+          push: true
+          tags: |
+            ghcr.io/loudbooks/pastebook-${{ matrix.component }}:${{ env.tag }}
+            ghcr.io/loudbooks/pastebook-${{ matrix.component }}:${{ env.hash }}
 
-    - name: Build and push frontend Docker image to Docker Hub
-      uses: docker/build-push-action@v3
-      with:
-        context: ./frontend
-        build-args: |
-          COMMIT_HASH=${{ env.hash }}
-        file: ./frontend/Dockerfile
-        push: true
-        tags: |
-          ${{ secrets.DOCKER_USERNAME }}/pastebook-frontend:${{ env.tag }}
-          ${{ secrets.DOCKER_USERNAME }}/pastebook-frontend:${{ env.hash }}
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
 
-    - name: Build and push backend Docker image to Docker Hub
-      uses: docker/build-push-action@v3
-      with:
-        context: ./backend
-        file: ./backend/Dockerfile
-        push: true
-        tags: |
-          ${{ secrets.DOCKER_USERNAME }}/pastebook-backend:${{ env.tag }}
-          ${{ secrets.DOCKER_USERNAME }}/pastebook-backend:${{ env.hash }}
+      - name: Build and push Docker image to Docker Hub
+        uses: docker/build-push-action@v3
+        with:
+          context: ./${{ matrix.component }}
+          file: ./${{ matrix.component }}/Dockerfile
+          build-args: |
+            COMMIT_HASH=${{ env.hash }}
+          push: true
+          tags: |
+            ${{ secrets.DOCKER_USERNAME }}/pastebook-${{ matrix.component }}:${{ env.tag }}
+            ${{ secrets.DOCKER_USERNAME }}/pastebook-${{ matrix.component }}:${{ env.hash }}