diff --git a/.github/workflows/tests-build-push.yml b/.github/workflows/tests-build-push.yml
index 3fb1fc1..44bcd98 100644
--- a/.github/workflows/tests-build-push.yml
+++ b/.github/workflows/tests-build-push.yml
@@ -47,12 +47,12 @@ jobs:
           file: docker/production/Dockerfile
 
       - name: Login to DockerHub
-        if: ${{ github.ref_name == 'main' }}
+        # if: ${{ github.ref_name == 'main' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
+
       - name: Build and push latest
         if: ${{ github.ref_name == 'main' }}
         uses: docker/build-push-action@v5
@@ -61,3 +61,12 @@ jobs:
           push: true
           file: docker/production/Dockerfile
           tags: jembi/smart-health-links-portal:latest
+
+      - name: Build and push tag
+        if: ${{ github.ref_name != 'main' }}
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: docker/production/Dockerfile
+          tags: jembi/smart-health-links-portal:hotfix
diff --git a/src/app/components/PatientSummaryViewer/resources/Composition/index.tsx b/src/app/components/PatientSummaryViewer/resources/Composition/index.tsx
index f3c3ff6..7ddf3aa 100644
--- a/src/app/components/PatientSummaryViewer/resources/Composition/index.tsx
+++ b/src/app/components/PatientSummaryViewer/resources/Composition/index.tsx
@@ -1,5 +1,7 @@
+import Box from '@mui/material/Box';
 import { JSX } from 'react';
 
+import { StyledButton } from '@/app/components/StyledButton';
 import {
   camelCaseToFlat,
   getSection,
@@ -520,6 +522,57 @@ const rows: TRow<TComposition>[] = [
         ) as JSX.Element[][],
     },
   },
+  {
+    type: 'row',
+    config: {
+      label: '',
+      render: ({ text }) => {
+        const toggleInfo = () => {
+          const infoDiv = document.getElementById('composition-generated');
+
+          if (!infoDiv) {
+            return null;
+          }
+
+          if (infoDiv.style.display === 'none') {
+            infoDiv.style.display = 'block';
+          } else {
+            infoDiv.style.display = 'none';
+          }
+          return null;
+        };
+
+        return (
+          <Box
+            sx={{
+              padding: '20px 0px',
+              width: '100%',
+              '& table': {
+                width: '100%',
+                borderCollapse: 'collapse',
+                marginBottom: '20px',
+                '& th, & td': {
+                  border: '1px solid gray',
+                  padding: '8px',
+                  textAlign: 'left',
+                },
+              },
+            }}
+          >
+            <StyledButton size="small" variant="contained" onClick={toggleInfo}>
+              Toggle Generated
+            </StyledButton>
+            <div
+              dangerouslySetInnerHTML={{ __html: text.div }}
+              className="extra-info"
+              id="composition-generated"
+              style={{ display: 'none' }}
+            />
+          </Box>
+        );
+      },
+    },
+  },
 ];
 
 export const Composition = (props: Omit<TTabProps<TComposition>, 'rows'>) => (
diff --git a/src/app/components/PatientSummaryViewer/resources/Immunization/index.tsx b/src/app/components/PatientSummaryViewer/resources/Immunization/index.tsx
index 552571b..90d8331 100644
--- a/src/app/components/PatientSummaryViewer/resources/Immunization/index.tsx
+++ b/src/app/components/PatientSummaryViewer/resources/Immunization/index.tsx
@@ -37,7 +37,7 @@ const rows: TRow<TImmunization>[] = [
       render: ({ performer }, references) =>
         getResource<EResource.Organization>(
           references,
-          performer?.[0]?.actor.reference,
+          performer?.[0]?.actor?.reference,
         )?.name,
     },
   },