diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
index 47ee65cd8..e359ea740 100644
--- a/.github/workflows/docker_publish.yml
+++ b/.github/workflows/docker_publish.yml
@@ -85,7 +85,7 @@ jobs:
             echo "REGISTRY=${{ matrix.registry }}" >> $GITHUB_ENV
             echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
           elif [ ${{ matrix.registry }} == 'ecr' ]; then
-            echo "REGISTRY=${{ steps.login-ecr-public.outputs.registry }}" >> $GITHUB_ENV
+            echo "REGISTRY=${{ vars.ECR_REGISTRY }}" >> $GITHUB_ENV
             echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
           else
             echo "REGISTRY=" >> $GITHUB_ENV
diff --git a/frontend/src/components/PageContainer/PageContainer.tsx b/frontend/src/components/PageContainer/PageContainer.tsx
index 9d209e032..4459de6a5 100644
--- a/frontend/src/components/PageContainer/PageContainer.tsx
+++ b/frontend/src/components/PageContainer/PageContainer.tsx
@@ -1,6 +1,7 @@
 import React, {
   type FC,
   type PropsWithChildren,
+  Suspense,
   useEffect,
   useMemo,
 } from 'react';
@@ -15,6 +16,7 @@ import { useClusters } from 'lib/hooks/api/clusters';
 import { ResourceType } from 'generated-sources';
 import { useGetUserInfo } from 'lib/hooks/api/roles';
 import { useScreenSize } from 'lib/hooks/useScreenSize';
+import PageLoader from 'components/common/PageLoader/PageLoader';
 
 const PageContainer: FC<PropsWithChildren> = ({ children }) => {
   const { isLarge } = useScreenSize();
@@ -62,7 +64,7 @@ const PageContainer: FC<PropsWithChildren> = ({ children }) => {
           aria-hidden="true"
           aria-label="Overlay"
         />
-        {children}
+        <Suspense fallback={<PageLoader fullSize />}>{children}</Suspense>
       </S.Container>
     </>
   );