diff --git a/web/src/pages/EdgeSetupPage/steps/SetupEdgeAdoptionStep.tsx b/web/src/pages/EdgeSetupPage/steps/SetupEdgeAdoptionStep.tsx
index e25220ed0c..b16b359add 100644
--- a/web/src/pages/EdgeSetupPage/steps/SetupEdgeAdoptionStep.tsx
+++ b/web/src/pages/EdgeSetupPage/steps/SetupEdgeAdoptionStep.tsx
@@ -154,6 +154,8 @@ export const SetupEdgeAdoptionStep = () => {
                 <CodeCard
                   title={m.edge_setup_adoption_error_log_title()}
                   value={edgeAdoptionState.proxyLogs.join('\n')}
+                  copy
+                  download
                 />
                 <SizedBox height={ThemeSpacing.Xl} />
               </>
diff --git a/web/src/pages/GatewaySetupPage/steps/SetupGatewayAdaptationStep.tsx b/web/src/pages/GatewaySetupPage/steps/SetupGatewayAdaptationStep.tsx
index babd602b9f..a9fc00afb3 100644
--- a/web/src/pages/GatewaySetupPage/steps/SetupGatewayAdaptationStep.tsx
+++ b/web/src/pages/GatewaySetupPage/steps/SetupGatewayAdaptationStep.tsx
@@ -162,6 +162,8 @@ export const SetupGatewayAdoptionStep = () => {
               <CodeCard
                 title={m.gateway_setup_adoption_error_log_title()}
                 value={gatewayAdoptionState.gatewayLogs.join('\n')}
+                copy
+                download
               />
             ) : null}
             <Controls>
diff --git a/web/src/pages/MigrationWizardPage/steps/MigrationWizardEdgeAdoptionStep.tsx b/web/src/pages/MigrationWizardPage/steps/MigrationWizardEdgeAdoptionStep.tsx
index da0c1a7319..621819c7e0 100644
--- a/web/src/pages/MigrationWizardPage/steps/MigrationWizardEdgeAdoptionStep.tsx
+++ b/web/src/pages/MigrationWizardPage/steps/MigrationWizardEdgeAdoptionStep.tsx
@@ -146,6 +146,8 @@ export const MigrationWizardEdgeAdoptionStep = () => {
                 <CodeCard
                   title={m.edge_setup_adoption_error_log_title()}
                   value={edgeAdoptionState.proxyLogs.join('\n')}
+                  copy
+                  download
                 />
                 <SizedBox height={ThemeSpacing.Xl} />
               </>
diff --git a/web/src/pages/SetupPage/autoAdoption/AutoAdoptionSetupPage.tsx b/web/src/pages/SetupPage/autoAdoption/AutoAdoptionSetupPage.tsx
index 6debe3f863..18fb77ef3f 100644
--- a/web/src/pages/SetupPage/autoAdoption/AutoAdoptionSetupPage.tsx
+++ b/web/src/pages/SetupPage/autoAdoption/AutoAdoptionSetupPage.tsx
@@ -11,9 +11,7 @@ import { CodeCard } from '../../../shared/defguard-ui/components/CodeCard/CodeCa
 import { Divider } from '../../../shared/defguard-ui/components/Divider/Divider';
 import { Icon } from '../../../shared/defguard-ui/components/Icon';
 import { SizedBox } from '../../../shared/defguard-ui/components/SizedBox/SizedBox';
-import { useClipboard } from '../../../shared/defguard-ui/hooks/useClipboard';
 import { ThemeSpacing } from '../../../shared/defguard-ui/types';
-import { downloadText } from '../../../shared/utils/download';
 import worldMap from '../assets/world-map.png';
 import { AutoAdoptionAdminUserStep } from './steps/AutoAdoptionAdminUserStep';
 import { AutoAdoptionMfaSetupStep } from './steps/AutoAdoptionMfaSetupStep';
@@ -47,8 +45,6 @@ type AutoAdoptionWelcomeContentProps = {
 const AutoAdoptionFailedWelcomeContent = ({
   results,
 }: AutoAdoptionWelcomeContentProps) => {
-  const { writeToClipboard } = useClipboard();
-
   return (
     <div className="auto-adoption-welcome-content">
       <Divider spacing={ThemeSpacing.Xl} />
@@ -94,16 +90,8 @@ const AutoAdoptionFailedWelcomeContent = ({
                         },
                       )}
                       value={componentLogs}
-                      onCopy={() => {
-                        void writeToClipboard(componentLogs);
-                      }}
-                      onDownload={() => {
-                        downloadText(
-                          componentLogs,
-                          `auto-adoption-error-log-${component}`,
-                          'txt',
-                        );
-                      }}
+                      copy
+                      download
                     />
                   </div>
                 )}
diff --git a/web/src/pages/SetupPage/initial/steps/SetupEdgeAdoptionStep.tsx b/web/src/pages/SetupPage/initial/steps/SetupEdgeAdoptionStep.tsx
index faa01a5aea..bf7ef4d50e 100644
--- a/web/src/pages/SetupPage/initial/steps/SetupEdgeAdoptionStep.tsx
+++ b/web/src/pages/SetupPage/initial/steps/SetupEdgeAdoptionStep.tsx
@@ -152,6 +152,8 @@ export const SetupEdgeAdoptionStep = () => {
                 <CodeCard
                   title={m.edge_setup_adoption_error_log_title()}
                   value={edgeAdoptionState.proxyLogs.join('\n')}
+                  copy
+                  download
                 />
                 <SizedBox height={ThemeSpacing.Xl} />
               </>
diff --git a/web/src/shared/defguard-ui b/web/src/shared/defguard-ui
index 61d017e5e5..4f0511917c 160000
--- a/web/src/shared/defguard-ui
+++ b/web/src/shared/defguard-ui
@@ -1 +1 @@
-Subproject commit 61d017e5e5ac75b687b73ec0b180df274de21a19
+Subproject commit 4f0511917cc970a87b7113bd240380d8747e80b9