diff --git a/JUSTFILE b/JUSTFILE
index e5bad34a6..df192aa99 100644
--- a/JUSTFILE
+++ b/JUSTFILE
@@ -2,9 +2,13 @@ default:
   @just --list
 mprocs:
     mprocs -c mprocs.yml
+rotate:
+    mprocs -c mprocs-rotate.yml
 restart:
     docker compose down && echo 'Removing fm dirs' && sudo rm -rf fm_* && echo 'Done' && mprocs -c mprocs.yml
 gateway:
     yarn nix-gateway
 guardian:
     yarn nix-guardian
+reset dc:
+    cp original-docker-compose.yml docker-compose.yml && docker compose down -v && echo 'Removing fm dirs' && sudo rm -rf fm_* && echo 'Done'
diff --git a/README.md b/README.md
index 42191d52f..284008c58 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,10 @@ This project includes the following apps / packages:
 - `eslint-config`: Shared `eslint` configurations (includes `eslint-plugin-react` and `eslint-config-prettier`)
 - `tsconfig`: Shared `tsconfig.json`s used throughout Fedimint UI apps
 
+## Testing
+
+For detailed testing instructions, please refer to the [testing.md](./testing.md) file in this repository. It contains comprehensive information on how to set up and run local tests for the Fedimint UI projects.
+
 ## Version Policy
 
 Fedimint UI releases use semantic versioning (`major.minor.patch`)
diff --git a/apps/guardian-ui/package.json b/apps/guardian-ui/package.json
index a265282e3..a9eaf29d9 100644
--- a/apps/guardian-ui/package.json
+++ b/apps/guardian-ui/package.json
@@ -26,6 +26,7 @@
     "framer-motion": "^6",
     "jsonrpc-client-websocket": "^1.5.2",
     "node": "^20.1.0",
+    "qr-scanner": "^1.4.2",
     "qrcode.react": "^3.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/apps/guardian-ui/src/GuardianApi.ts b/apps/guardian-ui/src/GuardianApi.ts
index 1071f2f71..c391c2b45 100644
--- a/apps/guardian-ui/src/GuardianApi.ts
+++ b/apps/guardian-ui/src/GuardianApi.ts
@@ -285,7 +285,7 @@ export class GuardianApi {
   public signApiAnnouncement = async (
     newUrl: string
   ): Promise<SignedApiAnnouncement> => {
-    return this.call(AdminRpc.signApiAnnouncement, { new_url: newUrl });
+    return this.call(AdminRpc.signApiAnnouncement, newUrl);
   };
 
   public shutdown = async (session?: number): Promise<void> => {
@@ -314,14 +314,14 @@ export class GuardianApi {
   ): Promise<T> => {
     try {
       const websocket = await this.connect();
-      console.log('method', method);
+      // console.log('method', method);
       const response = await websocket.call(method, [
         {
           auth: this.getPassword() || null,
           params,
         },
       ]);
-      console.log('response', response);
+      // console.log('response', response);
 
       if (response.error) {
         throw response.error;
diff --git a/apps/guardian-ui/src/admin/FederationAdmin.tsx b/apps/guardian-ui/src/admin/FederationAdmin.tsx
index c89dacd2d..0b2132022 100644
--- a/apps/guardian-ui/src/admin/FederationAdmin.tsx
+++ b/apps/guardian-ui/src/admin/FederationAdmin.tsx
@@ -1,5 +1,5 @@
-import React, { useEffect, useState } from 'react';
-import { Flex, Box, Heading, Skeleton } from '@chakra-ui/react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { Flex, Box, Heading, Skeleton, useDisclosure } from '@chakra-ui/react';
 import {
   ClientConfig,
   SignedApiAnnouncement,
@@ -15,6 +15,38 @@ import { InviteCode } from '../components/dashboard/admin/InviteCode';
 import { FederationTabsCard } from '../components/dashboard/tabs/FederationTabsCard';
 import { BftInfo } from '../components/BftInfo';
 import { DangerZone } from '../components/dashboard/danger/DangerZone';
+import { SignApiAnnouncement } from '../components/dashboard/danger/SignApiAnnouncement';
+import { normalizeUrl } from '../utils';
+
+const checkAnnouncementNeeded = (
+  currentApiUrl: string,
+  currentAnnouncement: SignedApiAnnouncement['api_announcement'] | undefined,
+  setAnnouncementNeeded: React.Dispatch<React.SetStateAction<boolean>>,
+  onOpen: () => void
+) => {
+  try {
+    if (currentAnnouncement) {
+      console.log('currentAnnouncement', currentAnnouncement.api_url);
+      console.log('currentApiUrl', currentApiUrl);
+      const announcementMatches =
+        normalizeUrl(currentAnnouncement.api_url) ===
+        normalizeUrl(currentApiUrl);
+      setAnnouncementNeeded(!announcementMatches);
+      if (!announcementMatches) {
+        onOpen();
+      }
+    }
+  } catch (error) {
+    console.error('Error checking announcement:', error);
+  }
+};
+
+const findOurPeerId = (
+  configPeerIds: number[],
+  statusPeerIds: number[]
+): number | undefined => {
+  return configPeerIds.find((id) => !statusPeerIds.includes(id));
+};
 
 export const FederationAdmin: React.FC = () => {
   const { api } = useAdminContext();
@@ -26,40 +58,65 @@ export const FederationAdmin: React.FC = () => {
   >({});
   const [ourPeer, setOurPeer] = useState<{ id: number; name: string }>();
   const [latestSession, setLatestSession] = useState<number>();
+  // API announcement modal
+  const { isOpen, onOpen, onClose } = useDisclosure();
+  const [announcementNeeded, setAnnouncementNeeded] = useState(false);
+  const checkAnnouncementRef = useRef(false);
 
-  // Extracting our peer ID and name from intersection of config and status
   useEffect(() => {
-    if (config && status?.federation) {
-      const peerIds = Object.keys(status.federation.status_by_peer).map((id) =>
-        parseInt(id, 10)
+    if (announcementNeeded) {
+      onOpen();
+    }
+  }, [announcementNeeded, onOpen]);
+
+  const fetchData = useCallback(() => {
+    api.inviteCode().then(setInviteCode).catch(console.error);
+    api.config().then(setConfig).catch(console.error);
+    api.apiAnnouncements().then(setSignedApiAnnouncements).catch(console.error);
+    api
+      .status()
+      .then((statusData) => {
+        setStatus(statusData);
+        setLatestSession(statusData?.federation?.session_count);
+      })
+      .catch(console.error);
+  }, [api]);
+
+  useEffect(() => {
+    fetchData();
+    const interval = setInterval(fetchData, 5000);
+    return () => clearInterval(interval);
+  }, [fetchData]);
+
+  useEffect(() => {
+    if (config && status?.federation && !checkAnnouncementRef.current) {
+      const statusPeerIds = Object.keys(status.federation.status_by_peer).map(
+        (id) => parseInt(id, 10)
       );
       const configPeerIds = Object.keys(config.global.api_endpoints).map((id) =>
         parseInt(id, 10)
       );
-      // Finding our peer ID as the one present in config but not in status
-      const ourPeerId = configPeerIds.find((id) => !peerIds.includes(id));
+
+      const ourPeerId = findOurPeerId(configPeerIds, statusPeerIds);
       if (ourPeerId !== undefined) {
         setOurPeer({
           id: ourPeerId,
           name: config.global.api_endpoints[ourPeerId].name,
         });
+        const currentApiUrl = process.env.REACT_APP_FM_CONFIG_API || '';
+        const currentAnnouncement =
+          signedApiAnnouncements[ourPeerId.toString()]?.api_announcement;
+
+        checkAnnouncementNeeded(
+          currentApiUrl,
+          currentAnnouncement,
+          setAnnouncementNeeded,
+          onOpen
+        );
+        checkAnnouncementRef.current = true;
       }
-      const latestSession = status?.federation?.session_count;
-      setLatestSession(latestSession);
     }
-  }, [config, status]);
-
-  useEffect(() => {
-    api.inviteCode().then(setInviteCode).catch(console.error);
-    api.config().then(setConfig).catch(console.error);
-    const fetchStatus = () => {
-      api.status().then(setStatus).catch(console.error);
-    };
-    api.apiAnnouncements().then(setSignedApiAnnouncements).catch(console.error);
-    fetchStatus();
-    const interval = setInterval(fetchStatus, 5000);
-    return () => clearInterval(interval);
-  }, [api]);
+  }, [config, status, signedApiAnnouncements, onOpen]);
 
   return (
     <Flex gap='32px' flexDirection='row'>
@@ -109,16 +166,30 @@ export const FederationAdmin: React.FC = () => {
           signedApiAnnouncements={signedApiAnnouncements}
         />
         <GatewaysCard config={config} />
-        {ourPeer ? (
-          <FederationTabsCard config={config} ourPeer={ourPeer} />
-        ) : null}
+        {ourPeer && (
+          <FederationTabsCard
+            config={config}
+            ourPeer={ourPeer}
+            signedApiAnnouncements={signedApiAnnouncements}
+          />
+        )}
         <DangerZone
           inviteCode={inviteCode}
           ourPeer={ourPeer}
           latestSession={latestSession}
           signedApiAnnouncements={signedApiAnnouncements}
+          onApiAnnouncementOpen={onOpen}
         />
       </Flex>
+      {ourPeer && (
+        <SignApiAnnouncement
+          isOpen={isOpen}
+          onClose={onClose}
+          ourPeer={ourPeer}
+          signedApiAnnouncements={signedApiAnnouncements}
+          currentApiUrl={process.env.REACT_APP_FM_CONFIG_API || ''}
+        />
+      )}
     </Flex>
   );
 };
diff --git a/apps/guardian-ui/src/assets/svgs/scan.svg b/apps/guardian-ui/src/assets/svgs/scan.svg
new file mode 100644
index 000000000..d10f70eeb
--- /dev/null
+++ b/apps/guardian-ui/src/assets/svgs/scan.svg
@@ -0,0 +1,14 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+
+  <path d="M4 7V6C4 5.46957 4.21071 4.96086 4.58579 4.58579C4.96086 4.21071 5.46957 4 6 4H8"
+    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+  <path d="M4 17V18C4 18.5304 4.21071 19.0391 4.58579 19.4142C4.96086 19.7893 5.46957 20 6 20H8"
+    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+  <path d="M16 4H18C18.5304 4 19.0391 4.21071 19.4142 4.58579C19.7893 4.96086 20 5.46957 20 6V7"
+    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+  <path
+    d="M16 20H18C18.5304 20 19.0391 19.7893 19.4142 19.4142C19.7893 19.0391 20 18.5304 20 18V17"
+    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+  <path d="M5 12H19" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+    stroke-linejoin="round" />
+</svg>
diff --git a/apps/guardian-ui/src/components/dashboard/admin/BitcoinNodeCard.tsx b/apps/guardian-ui/src/components/dashboard/admin/BitcoinNodeCard.tsx
index ede62f8a1..50cba77bf 100644
--- a/apps/guardian-ui/src/components/dashboard/admin/BitcoinNodeCard.tsx
+++ b/apps/guardian-ui/src/components/dashboard/admin/BitcoinNodeCard.tsx
@@ -35,14 +35,10 @@ export const BitcoinNodeCard: React.FC<Props> = ({ modulesConfigs }) => {
         key: 'network',
         label: t('federation-dashboard.bitcoin-node.network-label'),
         value: walletConfig ? (
-          <Text as='span'>
-            {walletConfig.network && (
-              <NetworkIndicator
-                network={walletConfig.network}
-                bitcoinRpcUrl={walletConfig.default_bitcoin_rpc?.url}
-              />
-            )}
-          </Text>
+          <NetworkIndicator
+            network={walletConfig.network}
+            bitcoinRpcUrl={walletConfig.default_bitcoin_rpc?.url}
+          />
         ) : (
           <Skeleton height='24px' width='100px' />
         ),
diff --git a/apps/guardian-ui/src/components/dashboard/admin/InviteCode.tsx b/apps/guardian-ui/src/components/dashboard/admin/InviteCode.tsx
index e6e96218f..60085601d 100644
--- a/apps/guardian-ui/src/components/dashboard/admin/InviteCode.tsx
+++ b/apps/guardian-ui/src/components/dashboard/admin/InviteCode.tsx
@@ -18,8 +18,7 @@ import { useTranslation } from '@fedimint/utils';
 import { ReactComponent as CopyIcon } from '../../../assets/svgs/copy.svg';
 import { ReactComponent as QrIcon } from '../../../assets/svgs/qr.svg';
 import QRCode from 'qrcode.react';
-
-const QR_CODE_SIZE = 256;
+import { QR_CODE_SIZE } from '../../../utils/constants';
 
 interface InviteCodeProps {
   inviteCode: string;
diff --git a/apps/guardian-ui/src/components/dashboard/danger/DangerZone.tsx b/apps/guardian-ui/src/components/dashboard/danger/DangerZone.tsx
index dc5dee86f..8704fbc08 100644
--- a/apps/guardian-ui/src/components/dashboard/danger/DangerZone.tsx
+++ b/apps/guardian-ui/src/components/dashboard/danger/DangerZone.tsx
@@ -1,5 +1,13 @@
 import React, { useState } from 'react';
-import { Box, Text, Flex, theme, Collapse, IconButton } from '@chakra-ui/react';
+import {
+  Box,
+  Text,
+  Flex,
+  theme,
+  Collapse,
+  IconButton,
+  Button,
+} from '@chakra-ui/react';
 import { GuardianAuthenticationCode } from './GuardianAuthenticationCode';
 import { DownloadBackup } from './DownloadBackup';
 import { useTranslation } from '@fedimint/utils';
@@ -7,20 +15,20 @@ import { ReactComponent as ChevronDownIcon } from '../../../assets/svgs/chevron-
 import { ReactComponent as ChevronUpIcon } from '../../../assets/svgs/chevron-up.svg';
 import { ScheduleShutdown } from './ScheduleShutdown';
 import { SignedApiAnnouncement } from '@fedimint/types';
-import { SignApiAnnouncement } from './SignApiAnnouncement';
 
 interface DangerZoneProps {
   ourPeer: { id: number; name: string } | undefined;
   inviteCode: string;
   latestSession: number | undefined;
   signedApiAnnouncements: Record<string, SignedApiAnnouncement>;
+  onApiAnnouncementOpen: () => void;
 }
 
 export const DangerZone: React.FC<DangerZoneProps> = ({
   ourPeer,
   inviteCode,
   latestSession,
-  signedApiAnnouncements,
+  onApiAnnouncementOpen,
 }) => {
   const { t } = useTranslation();
   const [isOpen, setIsOpen] = useState(false);
@@ -59,7 +67,7 @@ export const DangerZone: React.FC<DangerZoneProps> = ({
       </Flex>
       <Collapse in={isOpen} animateOpacity>
         <Flex direction={['column', 'row']} alignItems='center' gap='6px'>
-          {ourPeer !== undefined && (
+          {ourPeer && (
             <GuardianAuthenticationCode
               ourPeer={ourPeer}
               inviteCode={inviteCode}
@@ -67,10 +75,16 @@ export const DangerZone: React.FC<DangerZoneProps> = ({
           )}
           <DownloadBackup />
           {ourPeer && (
-            <SignApiAnnouncement
-              ourPeer={ourPeer}
-              signedApiAnnouncements={signedApiAnnouncements}
-            />
+            <Button
+              size={['sm', 'md']}
+              bg={theme.colors.red[500]}
+              _hover={{ bg: theme.colors.red[600] }}
+              onClick={onApiAnnouncementOpen}
+            >
+              {t(
+                'federation-dashboard.danger-zone.sign-api-announcement.label'
+              )}
+            </Button>
           )}
           {latestSession && <ScheduleShutdown latestSession={latestSession} />}
         </Flex>
diff --git a/apps/guardian-ui/src/components/dashboard/danger/GuardianAuthenticationCode.tsx b/apps/guardian-ui/src/components/dashboard/danger/GuardianAuthenticationCode.tsx
index 909e708d4..397c4e89a 100644
--- a/apps/guardian-ui/src/components/dashboard/danger/GuardianAuthenticationCode.tsx
+++ b/apps/guardian-ui/src/components/dashboard/danger/GuardianAuthenticationCode.tsx
@@ -13,8 +13,8 @@ import {
 } from '@chakra-ui/react';
 import { useTranslation } from '@fedimint/utils';
 import QRCode from 'qrcode.react';
+import { QR_CODE_SIZE } from '../../../utils/constants';
 
-const QR_CODE_SIZE = 256;
 const FEDIMINT_GUARDIAN_PREFIX = 'fedimint:guardian:';
 
 type GuardianAuth = {
@@ -89,7 +89,7 @@ export const GuardianAuthenticationCode: React.FC<
               >
                 <Text mb={4}>
                   {t(
-                    'federation-dashboard.danger-zone.guardian-warning-message',
+                    'federation-dashboard.danger-zone.guardian-warning-message'
                   )}
                 </Text>
                 <Flex
@@ -113,7 +113,7 @@ export const GuardianAuthenticationCode: React.FC<
                     }}
                   >
                     {t(
-                      'federation-dashboard.danger-zone.acknowledge-and-download',
+                      'federation-dashboard.danger-zone.acknowledge-and-download'
                     )}
                   </Button>
                 </Flex>
@@ -135,7 +135,7 @@ export const GuardianAuthenticationCode: React.FC<
                 />
                 <Text fontWeight={'bold'} color={'red'} mt={4}>
                   {t(
-                    'federation-dashboard.danger-zone.guardian-connect-warning',
+                    'federation-dashboard.danger-zone.guardian-connect-warning'
                   )}
                 </Text>
               </Flex>
diff --git a/apps/guardian-ui/src/components/dashboard/danger/SignApiAnnouncement.tsx b/apps/guardian-ui/src/components/dashboard/danger/SignApiAnnouncement.tsx
index 99f820302..c2f5b4801 100644
--- a/apps/guardian-ui/src/components/dashboard/danger/SignApiAnnouncement.tsx
+++ b/apps/guardian-ui/src/components/dashboard/danger/SignApiAnnouncement.tsx
@@ -10,143 +10,178 @@ import {
   ModalCloseButton,
   Text,
   Flex,
-  useDisclosure,
   Box,
   Icon,
   Tooltip,
   Divider,
-  useTheme,
+  Input,
 } from '@chakra-ui/react';
 import { useTranslation } from '@fedimint/utils';
 import { SignedApiAnnouncement } from '@fedimint/types';
 import { normalizeUrl } from '../../../utils';
-import { FiCheckCircle, FiAlertTriangle } from 'react-icons/fi';
+import { FiCheckCircle, FiAlertTriangle, FiEdit2 } from 'react-icons/fi';
 import { useAdminContext } from '../../../hooks';
 
 interface SignApiAnnouncementProps {
+  isOpen: boolean;
+  onClose: () => void;
   ourPeer: { id: number; name: string };
   signedApiAnnouncements: Record<string, SignedApiAnnouncement>;
+  currentApiUrl: string;
 }
 
 export const SignApiAnnouncement: React.FC<SignApiAnnouncementProps> = ({
+  isOpen,
+  onClose,
   ourPeer,
   signedApiAnnouncements,
+  currentApiUrl,
 }) => {
   const { api } = useAdminContext();
   const { t } = useTranslation();
-  const theme = useTheme();
-  const { isOpen, onOpen, onClose } = useDisclosure();
   const [isSigningNew, setIsSigningNew] = useState(false);
+  const [isEditing, setIsEditing] = useState(false);
+  const [apiUrl, setApiUrl] = useState(currentApiUrl);
 
-  const currentApiUrl = process.env.REACT_APP_FM_CONFIG_API || '';
   const currentAnnouncement = ourPeer
-    ? signedApiAnnouncements[ourPeer.id.toString()].api_announcement
+    ? signedApiAnnouncements[ourPeer.id.toString()]?.api_announcement
     : undefined;
 
   const announcementMatches = useMemo(() => {
     if (!currentAnnouncement) return false;
-    return (
-      normalizeUrl(currentAnnouncement.api_url) === normalizeUrl(currentApiUrl)
-    );
-  }, [currentAnnouncement, currentApiUrl]);
+    return normalizeUrl(currentAnnouncement.api_url) === normalizeUrl(apiUrl);
+  }, [currentAnnouncement, apiUrl]);
+
+  const handleClose = () => {
+    setApiUrl(currentApiUrl);
+    setIsEditing(false);
+    onClose();
+  };
+
+  const handleEditApiUrl = () => {
+    setIsEditing(true);
+  };
+
+  const handleSaveApiUrl = () => {
+    setIsEditing(false);
+  };
 
   const handleSignNewAnnouncement = () => {
     setIsSigningNew(true);
-    api.signApiAnnouncement(currentApiUrl).then(() => {
-      setIsSigningNew(false);
-      onClose();
-    });
+    api
+      .signApiAnnouncement(apiUrl)
+      .then(() => {
+        setIsSigningNew(false);
+        onClose();
+      })
+      .catch((error) => {
+        setIsSigningNew(false);
+        console.error('Failed to sign API announcement:', error);
+      });
   };
 
   return (
-    <>
-      <Button
-        size={['sm', 'md']}
-        bg={theme.colors.red[500]}
-        _hover={{ bg: theme.colors.red[600] }}
-        onClick={onOpen}
-      >
-        {t('federation-dashboard.danger-zone.sign-api-announcement.label')}
-      </Button>
-
-      <Modal isOpen={isOpen} onClose={onClose} size='lg'>
-        <ModalOverlay />
-        <ModalContent>
-          <ModalHeader bg='blue.50' borderTopRadius='md'>
-            {t('federation-dashboard.danger-zone.sign-api-announcement.title')}
-          </ModalHeader>
-          <ModalCloseButton />
-          <ModalBody py={6}>
-            <Flex direction='column' gap={4}>
-              <Box borderWidth={1} borderRadius='md' p={4} bg='gray.50'>
-                <Text fontWeight='bold' mb={2}>
-                  {t(
-                    'federation-dashboard.danger-zone.sign-api-announcement.current-api-url'
-                  )}
-                </Text>
-                <Text fontFamily='mono'>{currentApiUrl}</Text>
-              </Box>
-              <Box borderWidth={1} borderRadius='md' p={4} bg='gray.50'>
-                <Text fontWeight='bold' mb={2}>
-                  {t(
-                    'federation-dashboard.danger-zone.sign-api-announcement.announced-api-url'
-                  )}
-                </Text>
-                <Text fontFamily='mono'>
-                  {currentAnnouncement?.api_url || t('common.unknown')}
-                </Text>
-              </Box>
-              <Divider my={2} />
-              <Flex align='center' gap={2}>
-                <Icon
-                  as={announcementMatches ? FiCheckCircle : FiAlertTriangle}
-                  color={announcementMatches ? 'green.500' : 'orange.500'}
-                  boxSize={6}
+    <Modal isOpen={isOpen} onClose={handleClose} size='lg'>
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader bg='blue.50' borderTopRadius='md'>
+          {t('federation-dashboard.danger-zone.sign-api-announcement.title')}
+        </ModalHeader>
+        <ModalCloseButton />
+        <ModalBody py={6}>
+          <Flex direction='column' gap={4}>
+            <Box borderWidth={1} borderRadius='md' p={4} bg='gray.50'>
+              <Text fontWeight='bold' mb={2}>
+                {t(
+                  'federation-dashboard.danger-zone.sign-api-announcement.current-api-url'
+                )}
+              </Text>
+              {isEditing ? (
+                <Input
+                  value={apiUrl}
+                  onChange={(e) => setApiUrl(e.target.value)}
+                  onBlur={handleSaveApiUrl}
+                  fontFamily='mono'
                 />
-                <Text
-                  fontWeight='medium'
-                  color={announcementMatches ? 'green.600' : 'orange.600'}
-                >
-                  {announcementMatches
-                    ? t(
-                        'federation-dashboard.danger-zone.sign-api-announcement.urls-match'
-                      )
-                    : t(
-                        'federation-dashboard.danger-zone.sign-api-announcement.urls-mismatch'
-                      )}
-                </Text>
-              </Flex>
+              ) : (
+                <Flex align='center'>
+                  <Text fontFamily='mono' flex={1}>
+                    {apiUrl}
+                  </Text>
+                  <Icon
+                    as={FiEdit2}
+                    color='blue.500'
+                    boxSize={4}
+                    cursor='pointer'
+                    onClick={handleEditApiUrl}
+                  />
+                </Flex>
+              )}
+            </Box>
+            <Box borderWidth={1} borderRadius='md' p={4} bg='gray.50'>
+              <Text fontWeight='bold' mb={2}>
+                {t(
+                  'federation-dashboard.danger-zone.sign-api-announcement.announced-api-url'
+                )}
+              </Text>
+              <Text fontFamily='mono' flex={1}>
+                {signedApiAnnouncements[ourPeer.id.toString()]?.api_announcement
+                  ?.api_url ||
+                  t(
+                    'federation-dashboard.danger-zone.sign-api-announcement.no-announcement'
+                  )}
+              </Text>
+            </Box>
+            <Divider my={2} />
+            <Flex align='center' gap={2}>
+              <Icon
+                as={announcementMatches ? FiCheckCircle : FiAlertTriangle}
+                color={announcementMatches ? 'green.500' : 'orange.500'}
+                boxSize={6}
+              />
+              <Text
+                fontWeight='medium'
+                color={announcementMatches ? 'green.600' : 'orange.600'}
+              >
+                {announcementMatches
+                  ? t(
+                      'federation-dashboard.danger-zone.sign-api-announcement.urls-match'
+                    )
+                  : t(
+                      'federation-dashboard.danger-zone.sign-api-announcement.urls-mismatch'
+                    )}
+              </Text>
             </Flex>
-          </ModalBody>
+          </Flex>
+        </ModalBody>
 
-          <ModalFooter bg='gray.50' borderBottomRadius='md'>
-            {!announcementMatches && (
-              <Tooltip
-                label={t(
-                  'federation-dashboard.danger-zone.sign-api-announcement.sign-tooltip'
+        <ModalFooter bg='gray.50' borderBottomRadius='md'>
+          {!announcementMatches && (
+            <Tooltip
+              label={t(
+                'federation-dashboard.danger-zone.sign-api-announcement.sign-tooltip'
+              )}
+            >
+              <Button
+                colorScheme='blue'
+                mr={3}
+                onClick={handleSignNewAnnouncement}
+                isLoading={isSigningNew}
+                loadingText={t(
+                  'federation-dashboard.danger-zone.sign-api-announcement.signing-in-progress'
                 )}
               >
-                <Button
-                  colorScheme='blue'
-                  mr={3}
-                  onClick={handleSignNewAnnouncement}
-                  isLoading={isSigningNew}
-                  loadingText={t(
-                    'federation-dashboard.danger-zone.sign-api-announcement.signing-in-progress'
-                  )}
-                >
-                  {t(
-                    'federation-dashboard.danger-zone.sign-api-announcement.sign-button'
-                  )}
-                </Button>
-              </Tooltip>
-            )}
-            <Button variant='ghost' onClick={onClose}>
-              {t('common.close')}
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-    </>
+                {t(
+                  'federation-dashboard.danger-zone.sign-api-announcement.sign-button'
+                )}
+              </Button>
+            </Tooltip>
+          )}
+          <Button variant='ghost' onClick={handleClose}>
+            {t('common.close')}
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
   );
 };
diff --git a/apps/guardian-ui/src/components/dashboard/tabs/ApiAnnouncements.tsx b/apps/guardian-ui/src/components/dashboard/tabs/ApiAnnouncements.tsx
index d8f8cde21..2525940e0 100644
--- a/apps/guardian-ui/src/components/dashboard/tabs/ApiAnnouncements.tsx
+++ b/apps/guardian-ui/src/components/dashboard/tabs/ApiAnnouncements.tsx
@@ -20,15 +20,17 @@ export const ApiAnnouncements: React.FC<Props> = ({
     () => [
       {
         key: 'guardian',
-        heading: t('federation-dashboard.api-announcements.guardian-label'),
+        heading: t('federation-dashboard.api-announcements.guardian'),
+        width: '20%',
       },
       {
         key: 'revision',
-        heading: t('federation-dashboard.api-announcements.revision-label'),
+        heading: t('federation-dashboard.api-announcements.revision'),
+        width: '10%',
       },
       {
         key: 'apiUrl',
-        heading: t('federation-dashboard.api-announcements.api-url-label'),
+        heading: t('federation-dashboard.api-announcements.api-url'),
       },
     ],
     [t]
diff --git a/apps/guardian-ui/src/components/dashboard/tabs/FederationTabsCard.tsx b/apps/guardian-ui/src/components/dashboard/tabs/FederationTabsCard.tsx
index d3d6da56c..a7bf40c9c 100644
--- a/apps/guardian-ui/src/components/dashboard/tabs/FederationTabsCard.tsx
+++ b/apps/guardian-ui/src/components/dashboard/tabs/FederationTabsCard.tsx
@@ -13,19 +13,27 @@ import {
 import { githubLight } from '@uiw/codemirror-theme-github';
 import { json } from '@codemirror/lang-json';
 import CodeMirror from '@uiw/react-codemirror';
-import { ClientConfig, MetaFields, ModuleKind } from '@fedimint/types';
+import {
+  ClientConfig,
+  MetaFields,
+  ModuleKind,
+  SignedApiAnnouncement,
+} from '@fedimint/types';
 import { useTranslation } from '@fedimint/utils';
 import { MetaManager } from './meta/MetaManager';
 import { ConsensusMetaFields } from './meta/ViewConsensusMeta';
+import { ApiAnnouncements } from './ApiAnnouncements';
 
 interface FederationTabsCardProps {
   config: ClientConfig | undefined;
   ourPeer: { id: number; name: string };
+  signedApiAnnouncements: Record<string, SignedApiAnnouncement>;
 }
 
 export const FederationTabsCard: React.FC<FederationTabsCardProps> = ({
   config,
   ourPeer,
+  signedApiAnnouncements,
 }) => {
   const { t } = useTranslation();
   const [metaModuleId, setMetaModuleId] = useState<string | undefined>(
@@ -63,10 +71,9 @@ export const FederationTabsCard: React.FC<FederationTabsCardProps> = ({
           <Flex direction='column' gap='4'>
             <Flex justify='space-between' align='center'>
               <TabList>
-                <Tab>
-                  {t('federation-dashboard.config.manage-meta.tab-label')}
-                </Tab>
+                <Tab>{t('federation-dashboard.config.manage-meta.label')}</Tab>
                 <Tab>{t('federation-dashboard.config.view-config')}</Tab>
+                <Tab>{t('federation-dashboard.api-announcements.label')}</Tab>
               </TabList>
             </Flex>
           </Flex>
@@ -95,6 +102,12 @@ export const FederationTabsCard: React.FC<FederationTabsCardProps> = ({
                 readOnly
               />
             </TabPanel>
+            <TabPanel>
+              <ApiAnnouncements
+                signedApiAnnouncements={signedApiAnnouncements}
+                config={config}
+              />
+            </TabPanel>
           </TabPanels>
         </CardBody>
       </Tabs>
diff --git a/apps/guardian-ui/src/components/setup/qr/QrModal.tsx b/apps/guardian-ui/src/components/setup/qr/QrModal.tsx
new file mode 100644
index 000000000..b424cf973
--- /dev/null
+++ b/apps/guardian-ui/src/components/setup/qr/QrModal.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import {
+  Modal as ChakraModal,
+  ModalOverlay,
+  ModalContent,
+  ModalHeader,
+  ModalCloseButton,
+  ModalBody,
+  Flex,
+  Button,
+  useClipboard,
+} from '@chakra-ui/react';
+import QRCode from 'qrcode.react';
+
+interface QrModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  content: string;
+  header: string;
+}
+
+export const QrModal: React.FC<QrModalProps> = ({
+  isOpen,
+  onClose,
+  content,
+  header,
+}) => {
+  const { onCopy, hasCopied } = useClipboard(content);
+
+  return (
+    <ChakraModal isOpen={isOpen} onClose={onClose} isCentered>
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader>{header}</ModalHeader>
+        <ModalCloseButton />
+        <ModalBody
+          display='flex'
+          justifyContent='center'
+          alignItems='center'
+          pb={8}
+        >
+          <Flex direction='column' alignItems='center' gap={4}>
+            <QRCode value={content} size={256} />
+            <Flex alignItems='center' gap={2}>
+              <Button onClick={onCopy}>{hasCopied ? 'Copied!' : 'Copy'}</Button>
+            </Flex>
+          </Flex>
+        </ModalBody>
+      </ModalContent>
+    </ChakraModal>
+  );
+};
diff --git a/apps/guardian-ui/src/components/setup/qr/QrScannerModal.tsx b/apps/guardian-ui/src/components/setup/qr/QrScannerModal.tsx
new file mode 100644
index 000000000..015d7cc4f
--- /dev/null
+++ b/apps/guardian-ui/src/components/setup/qr/QrScannerModal.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import {
+  Modal as ChakraModal,
+  ModalOverlay,
+  ModalContent,
+  ModalHeader,
+  ModalCloseButton,
+  ModalBody,
+  useToast,
+  Button,
+  Flex,
+} from '@chakra-ui/react';
+import { Scanner } from './Scanner';
+
+interface QrScannerModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onScan: (data: string) => void;
+  title?: string;
+}
+
+export const QrScannerModal: React.FC<QrScannerModalProps> = ({
+  isOpen,
+  onClose,
+  onScan,
+  title = 'Scan QR Code',
+}) => {
+  const toast = useToast();
+
+  const handleScan = (data: string) => {
+    onScan(data);
+    onClose();
+  };
+  const handlePaste = async () => {
+    try {
+      const text = await navigator.clipboard.readText();
+      handleScan(text);
+    } catch (error) {
+      console.error('Failed to read clipboard contents: ', error);
+      toast({
+        title: 'Paste Error',
+        description: 'Failed to read clipboard contents. Please try again.',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+      });
+    }
+  };
+
+  const handleError = (error: string) => {
+    console.error(error);
+    if (error.includes('play() request was interrupted')) {
+      toast({
+        title: 'Scanner Error',
+        description: 'The camera stream was interrupted. Please try again.',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+      });
+      onClose();
+    }
+  };
+
+  return (
+    <ChakraModal isOpen={isOpen} onClose={onClose} isCentered>
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader>{title}</ModalHeader>
+        <ModalCloseButton />
+        <ModalBody
+          display='flex'
+          justifyContent='center'
+          alignItems='center'
+          pb={8}
+        >
+          <Flex
+            direction='column'
+            width='100%'
+            alignItems='center'
+            gap={4}
+            minHeight='300px'
+          >
+            <Scanner
+              scanning={isOpen}
+              onResult={handleScan}
+              onError={(e) => handleError(e.toString())}
+            />
+            <Button onClick={handlePaste}>Paste</Button>
+          </Flex>
+        </ModalBody>
+      </ModalContent>
+    </ChakraModal>
+  );
+};
diff --git a/apps/guardian-ui/src/components/setup/qr/Scanner.tsx b/apps/guardian-ui/src/components/setup/qr/Scanner.tsx
new file mode 100644
index 000000000..ab20f42f5
--- /dev/null
+++ b/apps/guardian-ui/src/components/setup/qr/Scanner.tsx
@@ -0,0 +1,79 @@
+import QrScanner from 'qr-scanner';
+import React from 'react';
+
+export type ScannerProps = {
+  scanning: boolean;
+  onResult: (result: string) => void;
+  onError: (error: string) => void;
+} & React.VideoHTMLAttributes<HTMLVideoElement>;
+
+export const Scanner: React.FC<ScannerProps> = ({
+  scanning,
+  onResult,
+  onError,
+  ...props
+}) => {
+  const [res, setRes] = React.useState<string | null>(null);
+  const err = React.useRef<string | null>(null);
+  const ref = React.useRef<HTMLVideoElement>(null);
+  const scannerRef = React.useRef<QrScanner | null>(null);
+
+  React.useEffect(() => {
+    (async () => {
+      if (!ref.current) return;
+
+      if (scanning) {
+        scannerRef.current = new QrScanner(
+          ref.current,
+          (result) => {
+            if (result && res !== result.data) {
+              setRes(result.data);
+              onResult(result.data);
+              if (scannerRef.current) {
+                scannerRef.current.stop();
+                scannerRef.current.$overlay?.remove();
+              }
+            }
+          },
+          {
+            onDecodeError: (error) => {
+              if (typeof error === 'string' && err.current !== error) {
+                err.current = error;
+                onError(error);
+              } else if (
+                typeof error !== 'string' &&
+                err.current !== error.message
+              ) {
+                err.current = error.message;
+                onError(error.message);
+              }
+            },
+            highlightScanRegion: true,
+            highlightCodeOutline: true,
+            preferredCamera: 'environment',
+          }
+        );
+        scannerRef.current.setInversionMode('both');
+        await scannerRef.current.start();
+      } else if (scannerRef.current) {
+        scannerRef.current.stop();
+        scannerRef.current.destroy();
+        setRes(null);
+        err.current = null;
+        scannerRef.current = null;
+      }
+    })();
+
+    return () => {
+      scannerRef.current?.destroy();
+    };
+  }, [scanning, ref, onError, onResult, setRes, res]);
+
+  return (
+    <video
+      ref={ref}
+      {...props}
+      style={{ display: scanning ? 'block' : 'hidden', minHeight: '300px' }}
+    />
+  );
+};
diff --git a/apps/guardian-ui/src/components/setup/screens/connectGuardians/ConnectGuardians.tsx b/apps/guardian-ui/src/components/setup/screens/connectGuardians/ConnectGuardians.tsx
index d87aeb8be..536448157 100644
--- a/apps/guardian-ui/src/components/setup/screens/connectGuardians/ConnectGuardians.tsx
+++ b/apps/guardian-ui/src/components/setup/screens/connectGuardians/ConnectGuardians.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   FormControl,
   FormLabel,
@@ -21,7 +21,9 @@ import { useConsensusPolling, useSetupContext } from '../../../../hooks';
 import { GuardianRole } from '../../../../types';
 import { getModuleParamsFromConfig } from '../../../../utils/api';
 import { ReactComponent as CopyIcon } from '../../../../assets/svgs/copy.svg';
+import { ReactComponent as QrIcon } from '../../../../assets/svgs/qr.svg';
 import { BftInfo } from '../../../BftInfo';
+import { QrModal } from '../../qr/QrModal';
 
 interface Props {
   next(): void;
@@ -32,6 +34,7 @@ export const ConnectGuardians: React.FC<Props> = ({ next }) => {
   const {
     state: { role, peers, numPeers, configGenParams, ourCurrentId },
   } = useSetupContext();
+  const [isOpen, setIsOpen] = useState(false);
 
   const guardianLink = ourCurrentId !== null ? peers[ourCurrentId].api_url : '';
 
@@ -63,11 +66,24 @@ export const ConnectGuardians: React.FC<Props> = ({ next }) => {
       <Flex direction={['column', 'row']} gap={4} align='start'>
         <FormControl maxW={400} bg='blue.50' p={2} borderRadius='md'>
           <FormLabel>{t('connect-guardians.invite-guardians')}</FormLabel>
-          <CopyInput
-            value={guardianLink}
-            size='sm'
-            buttonLeftIcon={<Icon as={CopyIcon} />}
-          />
+          <Flex direction='row' alignItems='center' gap='6px'>
+            <CopyInput
+              value={guardianLink}
+              size='sm'
+              buttonLeftIcon={<Icon as={CopyIcon} />}
+            />
+            <Icon
+              as={QrIcon}
+              cursor='pointer'
+              onClick={() => setIsOpen(true)}
+              bg='white'
+              boxSize='40px'
+              borderRadius='10%'
+              border='1px solid lightgray'
+              _hover={{ bg: 'gray.100' }}
+            />
+          </Flex>
+
           <FormHelperText>
             {t('connect-guardians.invite-guardians-help')}
           </FormHelperText>
@@ -205,6 +221,12 @@ export const ConnectGuardians: React.FC<Props> = ({ next }) => {
           rows={peerTableRows}
         />
       )}
+      <QrModal
+        isOpen={isOpen}
+        onClose={() => setIsOpen(false)}
+        content={guardianLink}
+        header={t('connect-guardians.invite-guardians')}
+      />
     </Flex>
   );
 };
diff --git a/apps/guardian-ui/src/components/setup/screens/setConfiguration/BasicSettingsForm.tsx b/apps/guardian-ui/src/components/setup/screens/setConfiguration/BasicSettingsForm.tsx
index c7ac565ef..8d9122d6a 100644
--- a/apps/guardian-ui/src/components/setup/screens/setConfiguration/BasicSettingsForm.tsx
+++ b/apps/guardian-ui/src/components/setup/screens/setConfiguration/BasicSettingsForm.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import {
   FormControl,
   FormLabel,
@@ -8,11 +8,16 @@ import {
   Button,
   Text,
   useTheme,
+  Icon,
+  InputGroup,
+  InputRightElement,
 } from '@chakra-ui/react';
 import { useTranslation } from '@fedimint/utils';
 import { FormGroup } from '@fedimint/ui';
 import { ReactComponent as LightbulbLogo } from '../../../../assets/svgs/lightbulb.svg';
+import { ReactComponent as ScanIcon } from '../../../../assets/svgs/scan.svg';
 import { generatePassword } from '../../../../utils';
+import { QrScannerModal } from '../../qr/QrScannerModal';
 
 interface BasicSettingsFormProps {
   myName: string;
@@ -39,6 +44,7 @@ export const BasicSettingsForm: React.FC<BasicSettingsFormProps> = ({
 }) => {
   const { t } = useTranslation();
   const theme = useTheme();
+  const [isQrScannerOpen, setIsQrScannerOpen] = useState(false);
 
   return (
     <FormGroup
@@ -85,16 +91,34 @@ export const BasicSettingsForm: React.FC<BasicSettingsFormProps> = ({
       {isFollower && (
         <FormControl>
           <FormLabel>{t('set-config.join-federation')}</FormLabel>
-          <Input
-            value={hostServerUrl}
-            onChange={(ev) => setHostServerUrl(ev.currentTarget.value)}
-            placeholder='ws://...'
-          />
+          <InputGroup>
+            <Input
+              value={hostServerUrl}
+              onChange={(ev) => setHostServerUrl(ev.currentTarget.value)}
+              placeholder='ws://...'
+              pr='4.5rem'
+            />
+            <InputRightElement width='4.5rem'>
+              <Icon
+                as={ScanIcon}
+                cursor='pointer'
+                onClick={() => setIsQrScannerOpen(true)}
+                boxSize='1.5rem'
+                color='gray.500'
+                _hover={{ color: 'blue.500' }}
+              />
+            </InputRightElement>
+          </InputGroup>
           <FormHelperText>
             {t('set-config.join-federation-help')}
           </FormHelperText>
         </FormControl>
       )}
+      <QrScannerModal
+        isOpen={isQrScannerOpen}
+        onClose={() => setIsQrScannerOpen(false)}
+        onScan={(data) => setHostServerUrl(data)}
+      />
     </FormGroup>
   );
 };
diff --git a/apps/guardian-ui/src/components/setup/screens/verifyGuardians/ConfirmFollowersConnected.tsx b/apps/guardian-ui/src/components/setup/screens/verifyGuardians/ConfirmFollowersConnected.tsx
new file mode 100644
index 000000000..32ae0036f
--- /dev/null
+++ b/apps/guardian-ui/src/components/setup/screens/verifyGuardians/ConfirmFollowersConnected.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import {
+  Modal,
+  ModalOverlay,
+  ModalContent,
+  ModalCloseButton,
+  ModalBody,
+  ModalFooter,
+  Heading,
+  Text,
+  Button,
+} from '@chakra-ui/react';
+import { useTranslation } from 'react-i18next';
+
+interface ConfirmFollowersConnectedProps {
+  isOpen: boolean;
+  setIsOpen: (isOpen: boolean) => void;
+  handleNext: () => void;
+}
+
+export const ConfirmFollowersConnected: React.FC<
+  ConfirmFollowersConnectedProps
+> = ({ isOpen, setIsOpen, handleNext }) => {
+  const { t } = useTranslation();
+
+  return (
+    <Modal isOpen={isOpen} onClose={() => setIsOpen(false)}>
+      <ModalOverlay />
+      <ModalContent>
+        <ModalCloseButton />
+        <ModalBody p={6}>
+          <Heading size='md' mb={4}>
+            {t('common.confirm')}
+          </Heading>
+          <Text mb={4}>
+            {t('setup.progress.verify-guardians.leader-confirm-done')}
+          </Text>
+          <Text fontWeight='bold' textDecoration='underline'>
+            {t('setup.progress.verify-guardians.leader-confirm-done-emphasis')}
+          </Text>
+        </ModalBody>
+        <ModalFooter>
+          <Button
+            colorScheme='blue'
+            mr={3}
+            onClick={() => {
+              setIsOpen(false);
+              handleNext();
+            }}
+          >
+            {t('common.confirm')}
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+};
diff --git a/apps/guardian-ui/src/components/setup/screens/verifyGuardians/PeerVerificationTable.tsx b/apps/guardian-ui/src/components/setup/screens/verifyGuardians/PeerVerificationTable.tsx
new file mode 100644
index 000000000..85b93d824
--- /dev/null
+++ b/apps/guardian-ui/src/components/setup/screens/verifyGuardians/PeerVerificationTable.tsx
@@ -0,0 +1,156 @@
+import React from 'react';
+import {
+  FormControl,
+  Flex,
+  Text,
+  Input,
+  Tag,
+  Box,
+  InputGroup,
+  Hide,
+  Show,
+} from '@chakra-ui/react';
+import { Table } from '@fedimint/ui';
+import { useTranslation } from '@fedimint/utils';
+import { ReactComponent as CheckCircleIcon } from '../../../../assets/svgs/check-circle.svg';
+import { ReactComponent as XCircleIcon } from '../../../../assets/svgs/x-circle.svg';
+
+interface PeerWithHash {
+  id: string;
+  peer: {
+    name: string;
+    cert: string;
+  };
+  hash: string;
+}
+
+interface Props {
+  peersWithHash: PeerWithHash[];
+  enteredHashes: string[];
+  handleChangeHash: (value: string, index: number) => void;
+}
+
+export const PeerVerificationTable: React.FC<Props> = ({
+  peersWithHash,
+  enteredHashes,
+  handleChangeHash,
+}) => {
+  const { t } = useTranslation();
+
+  const tableColumns = [
+    {
+      key: 'name',
+      heading: t('verify-guardians.table-column-name'),
+      width: '200px',
+    },
+    {
+      key: 'status',
+      heading: t('verify-guardians.table-column-status'),
+      width: '160px',
+    },
+    {
+      key: 'hashInput',
+      heading: t('verify-guardians.table-column-hash-input'),
+    },
+  ];
+
+  const tableRows = peersWithHash.map(({ peer, hash }, idx) => {
+    const value = enteredHashes[idx] || '';
+    const isValid = Boolean(value && value === hash);
+    const isError = Boolean(value && !isValid);
+    return {
+      key: peer.cert,
+      name: (
+        <Text maxWidth={200} isTruncated>
+          {peer.name}
+        </Text>
+      ),
+      status: isValid ? (
+        <Tag colorScheme='green'>{t('verify-guardians.verified')}</Tag>
+      ) : (
+        ''
+      ),
+      hashInput: (
+        <FormControl isInvalid={isError}>
+          <Input
+            variant='filled'
+            value={value}
+            placeholder={`${t('verify-guardians.verified-placeholder')}`}
+            onChange={(ev) => handleChangeHash(ev.currentTarget.value, idx)}
+            readOnly={isValid}
+          />
+        </FormControl>
+      ),
+    };
+  });
+
+  return (
+    <>
+      <Hide below='sm'>
+        <Table
+          title={t('verify-guardians.table-title')}
+          description={t('verify-guardians.table-description')}
+          columns={tableColumns}
+          rows={tableRows}
+        />
+      </Hide>
+      <Show below='sm'>
+        <Flex direction='column' width='full' gap={4}>
+          {peersWithHash.map(({ peer, hash }, idx) => {
+            const value = enteredHashes[idx] || '';
+            const isValid = value === hash;
+            const isError = value && !isValid;
+
+            return (
+              <Box key={peer.cert}>
+                <Flex align='center' mb={2}>
+                  <Text fontWeight='bold' isTruncated>
+                    {peer.name}
+                  </Text>
+                  {isValid ? (
+                    <CheckCircleIcon
+                      color='green'
+                      style={{
+                        marginLeft: '8px',
+                        height: '1em',
+                        width: '1em',
+                      }}
+                    />
+                  ) : isError ? (
+                    <XCircleIcon
+                      color='red'
+                      style={{
+                        marginLeft: '8px',
+                        height: '1em',
+                        width: '1em',
+                      }}
+                    />
+                  ) : null}
+                </Flex>
+
+                <Flex direction='row' align='center' justify='start'>
+                  <FormControl>
+                    <InputGroup>
+                      <Input
+                        variant='filled'
+                        borderColor={'gray.100'}
+                        value={value}
+                        placeholder={`${t(
+                          'verify-guardians.verified-placeholder'
+                        )}`}
+                        onChange={(ev) =>
+                          handleChangeHash(ev.currentTarget.value, idx)
+                        }
+                        readOnly={isValid}
+                      />
+                    </InputGroup>
+                  </FormControl>
+                </Flex>
+              </Box>
+            );
+          })}
+        </Flex>
+      </Show>
+    </>
+  );
+};
diff --git a/apps/guardian-ui/src/components/setup/screens/verifyGuardians/VerificationButton.tsx b/apps/guardian-ui/src/components/setup/screens/verifyGuardians/VerificationButton.tsx
new file mode 100644
index 000000000..07832e826
--- /dev/null
+++ b/apps/guardian-ui/src/components/setup/screens/verifyGuardians/VerificationButton.tsx
@@ -0,0 +1,90 @@
+import React, { useState } from 'react';
+import {
+  Button,
+  Icon,
+  Flex,
+  Text,
+  Modal,
+  ModalOverlay,
+  ModalContent,
+  ModalCloseButton,
+  ModalBody,
+  ModalFooter,
+  Heading,
+} from '@chakra-ui/react';
+import { useTranslation } from '@fedimint/utils';
+import { ReactComponent as ArrowRightIcon } from '../../../../assets/svgs/arrow-right.svg';
+import { GuardianRole } from '../../../../types';
+
+interface VerificationButtonProps {
+  verifiedConfigs: boolean;
+  isStarting: boolean;
+  role: GuardianRole;
+  handleNext: () => void;
+}
+
+export const VerificationButton: React.FC<VerificationButtonProps> = ({
+  verifiedConfigs,
+  isStarting,
+  role,
+  handleNext,
+}) => {
+  const { t } = useTranslation();
+  const [isConfirmOpen, setIsConfirmOpen] = useState(false);
+
+  const handleClick = () => {
+    if (role === GuardianRole.Host) {
+      setIsConfirmOpen(true);
+    } else {
+      handleNext();
+    }
+  };
+
+  return (
+    <>
+      <Flex direction='row' gap={4} align='center' width='full'>
+        <Button
+          isDisabled={!verifiedConfigs}
+          isLoading={isStarting}
+          onClick={handleClick}
+          leftIcon={<Icon as={ArrowRightIcon} />}
+          width={{ base: 'full', sm: 'auto' }}
+        >
+          {t('common.next')}
+        </Button>
+      </Flex>
+
+      <Modal isOpen={isConfirmOpen} onClose={() => setIsConfirmOpen(false)}>
+        <ModalOverlay />
+        <ModalContent>
+          <ModalCloseButton />
+          <ModalBody p={6}>
+            <Heading size='md' mb={4}>
+              {t('common.confirm')}
+            </Heading>
+            <Text mb={4}>
+              {t('setup.progress.verify-guardians.leader-confirm-done')}
+            </Text>
+            <Text fontWeight='bold' textDecoration='underline'>
+              {t(
+                'setup.progress.verify-guardians.leader-confirm-done-emphasis'
+              )}
+            </Text>
+          </ModalBody>
+          <ModalFooter>
+            <Button
+              colorScheme='blue'
+              mr={3}
+              onClick={() => {
+                setIsConfirmOpen(false);
+                handleNext();
+              }}
+            >
+              {t('common.confirm')}
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    </>
+  );
+};
diff --git a/apps/guardian-ui/src/components/setup/screens/verifyGuardians/VerificationCodeInput.tsx b/apps/guardian-ui/src/components/setup/screens/verifyGuardians/VerificationCodeInput.tsx
new file mode 100644
index 000000000..c1e2fef54
--- /dev/null
+++ b/apps/guardian-ui/src/components/setup/screens/verifyGuardians/VerificationCodeInput.tsx
@@ -0,0 +1,72 @@
+import React from 'react';
+import {
+  FormControl,
+  FormLabel,
+  FormHelperText,
+  Flex,
+  Icon,
+  Button,
+  useTheme,
+} from '@chakra-ui/react';
+import { useTranslation } from '@fedimint/utils';
+import { CopyInput } from '@fedimint/ui';
+import { ReactComponent as CopyIcon } from '../../../../assets/svgs/copy.svg';
+import { ReactComponent as QrIcon } from '../../../../assets/svgs/qr.svg';
+import { ReactComponent as ScanIcon } from '../../../../assets/svgs/scan.svg';
+
+interface VerificationCodeInputProps {
+  myHash: string;
+  setQrModalOpen: (isOpen: boolean) => void;
+  isScannerActive: boolean;
+  setIsScannerActive: (isActive: boolean) => void;
+}
+
+export const VerificationCodeInput: React.FC<VerificationCodeInputProps> = ({
+  myHash,
+  setQrModalOpen,
+  isScannerActive,
+  setIsScannerActive,
+}) => {
+  const { t } = useTranslation();
+  const theme = useTheme();
+
+  return (
+    <FormControl bg={theme.colors.blue[50]} p={4} borderRadius='md' maxW='md'>
+      <FormLabel>{t('verify-guardians.verification-code')}</FormLabel>
+      <Flex direction='row' alignItems='center' gap='6px'>
+        <CopyInput
+          value={myHash}
+          buttonLeftIcon={<Icon as={CopyIcon} />}
+          size='sm'
+        />
+        <Icon
+          as={QrIcon}
+          cursor='pointer'
+          onClick={() => setQrModalOpen(true)}
+          bg='white'
+          boxSize='40px'
+          borderRadius='10%'
+          border='1px solid lightgray'
+          _hover={{ bg: 'gray.100' }}
+        />
+        <Button
+          onClick={() => setIsScannerActive(!isScannerActive)}
+          leftIcon={<Icon as={ScanIcon} />}
+          size='sm'
+          variant='outline'
+          bg='white'
+          borderColor='gray.200'
+          _hover={{ bg: 'gray.100' }}
+          color='black.700'
+        >
+          {isScannerActive
+            ? t('verify-guardians.stop-scan')
+            : t('verify-guardians.start-scan')}
+        </Button>
+      </Flex>
+      <FormHelperText>
+        {t('verify-guardians.verification-code-help')}
+      </FormHelperText>
+    </FormControl>
+  );
+};
diff --git a/apps/guardian-ui/src/components/setup/screens/verifyGuardians/VerifyGuardians.tsx b/apps/guardian-ui/src/components/setup/screens/verifyGuardians/VerifyGuardians.tsx
index af9de75c2..987a479d2 100644
--- a/apps/guardian-ui/src/components/setup/screens/verifyGuardians/VerifyGuardians.tsx
+++ b/apps/guardian-ui/src/components/setup/screens/verifyGuardians/VerifyGuardians.tsx
@@ -1,42 +1,22 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import {
-  Button,
-  FormControl,
-  FormLabel,
-  FormHelperText,
   Flex,
-  Icon,
   Heading,
   Text,
   Spinner,
-  Input,
-  Tag,
   useTheme,
   CircularProgress,
-  Hide,
-  Show,
-  Box,
-  InputGroup,
-  useBreakpointValue,
-  Stack,
-  StackDirection,
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  ModalFooter,
-  ModalBody,
-  ModalCloseButton,
 } from '@chakra-ui/react';
 import { ServerStatus, Peer } from '@fedimint/types';
 import { useTranslation } from '@fedimint/utils';
-import { CopyInput, Table } from '@fedimint/ui';
 import { useConsensusPolling, useSetupContext } from '../../../../hooks';
 import { GuardianRole } from '../../../../types';
-import { ReactComponent as ArrowRightIcon } from '../../../../assets/svgs/arrow-right.svg';
-import { ReactComponent as CopyIcon } from '../../../../assets/svgs/copy.svg';
 import { formatApiErrorMessage } from '../../../../utils/api';
-import { ReactComponent as CheckCircleIcon } from '../../../../assets/svgs/check-circle.svg';
-import { ReactComponent as XCircleIcon } from '../../../../assets/svgs/x-circle.svg';
+import { QrModal } from '../../qr/QrModal';
+import { Scanner } from '../../qr/Scanner';
+import { VerificationCodeInput } from './VerificationCodeInput';
+import { VerificationButton } from './VerificationButton';
+import { PeerVerificationTable } from './PeerVerificationTable';
 
 interface PeerWithHash {
   id: string;
@@ -63,7 +43,8 @@ export const VerifyGuardians: React.FC<Props> = ({ next }) => {
   const [verifiedConfigs, setVerifiedConfigs] = useState<boolean>(false);
   const [isStarting, setIsStarting] = useState(false);
   const [error, setError] = useState<string>();
-  const [isOpen, setIsOpen] = useState(false);
+  const [isQrModalOpen, setQrModalOpen] = useState(false);
+  const [isScannerActive, setIsScannerActive] = useState(false);
 
   // Poll for peers and configGenParams while on this page.
   useConsensusPolling();
@@ -149,7 +130,7 @@ export const VerifyGuardians: React.FC<Props> = ({ next }) => {
     toggleConsensusPolling,
   ]);
 
-  const handleNext = useCallback(async () => {
+  const handleNext = useCallback(async (): Promise<void> => {
     setIsStarting(true);
     try {
       await api.startConsensus();
@@ -167,31 +148,6 @@ export const VerifyGuardians: React.FC<Props> = ({ next }) => {
     }
   }, [handleNext, numPeers, isHost]);
 
-  const tableColumns = useMemo(
-    () => [
-      {
-        key: 'name',
-        heading: t('verify-guardians.table-column-name'),
-        width: '200px',
-      },
-      {
-        key: 'status',
-        heading: t('verify-guardians.table-column-status'),
-        width: '160px',
-      },
-      {
-        key: 'hashInput',
-        heading: t('verify-guardians.table-column-hash-input'),
-      },
-    ],
-    [t]
-  );
-
-  const direction = useBreakpointValue({
-    base: 'column-reverse',
-    sm: 'row',
-  }) as StackDirection | undefined;
-
   const handleChangeHash = useCallback((value: string, index: number) => {
     setEnteredHashes((hashes) => {
       const newHashes = [...hashes];
@@ -200,39 +156,6 @@ export const VerifyGuardians: React.FC<Props> = ({ next }) => {
     });
   }, []);
 
-  const tableRows = useMemo(() => {
-    if (!peersWithHash) return [];
-    return peersWithHash.map(({ peer, hash }, idx) => {
-      const value = enteredHashes[idx] || '';
-      const isValid = Boolean(value && value === hash);
-      const isError = Boolean(value && !isValid);
-      return {
-        key: peer.cert,
-        name: (
-          <Text maxWidth={200} isTruncated>
-            {peer.name}
-          </Text>
-        ),
-        status: isValid ? (
-          <Tag colorScheme='green'>{t('verify-guardians.verified')}</Tag>
-        ) : (
-          ''
-        ),
-        hashInput: (
-          <FormControl isInvalid={isError}>
-            <Input
-              variant='filled'
-              value={value}
-              placeholder={`${t('verify-guardians.verified-placeholder')}`}
-              onChange={(ev) => handleChangeHash(ev.currentTarget.value, idx)}
-              readOnly={isValid}
-            />
-          </FormControl>
-        ),
-      };
-    });
-  }, [peersWithHash, enteredHashes, handleChangeHash, t]);
-
   if (error) {
     return (
       <Flex direction='column' gap={6}>
@@ -256,152 +179,42 @@ export const VerifyGuardians: React.FC<Props> = ({ next }) => {
   } else {
     return (
       <Flex direction='column' gap={10} justify='start' align='start'>
-        <FormControl
-          bg={theme.colors.blue[50]}
-          p={4}
-          borderRadius='md'
-          maxW='md'
-        >
-          <FormLabel>{t('verify-guardians.verification-code')}</FormLabel>
-          <CopyInput
-            value={myHash}
-            buttonLeftIcon={<Icon as={CopyIcon} />}
-            size='sm'
+        <VerificationCodeInput
+          myHash={myHash}
+          setQrModalOpen={setQrModalOpen}
+          isScannerActive={isScannerActive}
+          setIsScannerActive={setIsScannerActive}
+        />
+        {isScannerActive && (
+          <Scanner
+            scanning={true}
+            onResult={(data) => {
+              const [index, hash] = data.split(':');
+              handleChangeHash(hash, parseInt(index, 10));
+            }}
+            onError={(error) => console.error(error)}
           />
-          <FormHelperText>
-            {t('verify-guardians.verification-code-help')}
-          </FormHelperText>
-        </FormControl>
-        <Hide below='sm'>
-          <Table
-            title={t('verify-guardians.table-title')}
-            description={t('verify-guardians.table-description')}
-            columns={tableColumns}
-            rows={tableRows}
+        )}
+        {peersWithHash && (
+          <PeerVerificationTable
+            peersWithHash={peersWithHash}
+            enteredHashes={enteredHashes}
+            handleChangeHash={handleChangeHash}
           />
-        </Hide>
-        <Show below='sm'>
-          <Flex direction='column' width='full' gap={4}>
-            {peersWithHash.map(({ peer, hash }, idx) => {
-              const value = enteredHashes[idx] || '';
-              const isValid = value === hash;
-              const isError = value && !isValid;
-
-              return (
-                <Box key={peer.cert}>
-                  <Flex align='center' mb={2}>
-                    <Text fontWeight='bold' isTruncated>
-                      {peer.name}
-                    </Text>
-                    {isValid ? (
-                      <CheckCircleIcon
-                        color='green'
-                        style={{
-                          marginLeft: '8px',
-                          height: '1em',
-                          width: '1em',
-                        }}
-                      />
-                    ) : isError ? (
-                      <XCircleIcon
-                        color='red'
-                        style={{
-                          marginLeft: '8px',
-                          height: '1em',
-                          width: '1em',
-                        }}
-                      />
-                    ) : null}
-                  </Flex>
-
-                  <Flex direction='row' align='center' justify='start'>
-                    <FormControl>
-                      <InputGroup>
-                        <Input
-                          variant='filled'
-                          borderColor={'gray.100'}
-                          value={value}
-                          placeholder={`${t(
-                            'verify-guardians.verified-placeholder'
-                          )}`}
-                          onChange={(ev) =>
-                            handleChangeHash(ev.currentTarget.value, idx)
-                          }
-                          readOnly={isValid}
-                        />
-                      </InputGroup>
-                    </FormControl>
-                  </Flex>
-                </Box>
-              );
-            })}
-          </Flex>
-        </Show>
-        <Stack direction={direction} gap={4} width='full' align='center'>
-          <Button
-            isDisabled={!verifiedConfigs}
-            isLoading={isStarting}
-            onClick={
-              role === GuardianRole.Host ? () => setIsOpen(true) : handleNext
-            }
-            leftIcon={<Icon as={ArrowRightIcon} />}
-            width={{ base: 'full', sm: 'auto' }}
-          >
-            {t('common.next')}
-          </Button>
-          <WaitingForVerification verifiedConfigs={verifiedConfigs} />
-        </Stack>
-        <Modal isOpen={isOpen} onClose={() => setIsOpen(false)}>
-          <ModalOverlay />
-          <ModalContent>
-            <ModalCloseButton />
-            <ModalBody p={6}>
-              <Heading size='md' mb={4}>
-                {t('common.confirm')}
-              </Heading>
-              <Text mb={4}>
-                {t('setup.progress.verify-guardians.leader-confirm-done')}
-              </Text>
-              <Text fontWeight='bold' textDecoration='underline'>
-                {t(
-                  'setup.progress.verify-guardians.leader-confirm-done-emphasis'
-                )}
-              </Text>
-            </ModalBody>
-            <ModalFooter>
-              <Button
-                colorScheme='blue'
-                mr={3}
-                onClick={() => {
-                  setIsOpen(false);
-                  handleNext();
-                }}
-              >
-                {t('common.confirm')}
-              </Button>
-            </ModalFooter>
-          </ModalContent>
-        </Modal>
+        )}
+        <VerificationButton
+          role={role as GuardianRole}
+          verifiedConfigs={verifiedConfigs}
+          isStarting={isStarting}
+          handleNext={handleNext}
+        />
+        <QrModal
+          isOpen={isQrModalOpen}
+          onClose={() => setQrModalOpen(false)}
+          content={`${ourCurrentId}:${myHash}`}
+          header={t('verify-guardians.verification-code')}
+        />
       </Flex>
     );
   }
 };
-
-const WaitingForVerification: React.FC<{ verifiedConfigs: boolean }> = ({
-  verifiedConfigs,
-}) => {
-  const { t } = useTranslation();
-
-  return (
-    <Flex direction='row' height='100%' my={'auto'} gap={4} align='center'>
-      {verifiedConfigs ? (
-        <Text>{t('verify-guardians.all-guardians-verified')}</Text>
-      ) : (
-        <>
-          <Spinner />
-          <Text>{t('verify-guardians.wait-all-guardians-verification')}</Text>
-        </>
-      )}
-    </Flex>
-  );
-};
diff --git a/apps/guardian-ui/src/languages/en.json b/apps/guardian-ui/src/languages/en.json
index 53d19e7cf..76df1484b 100644
--- a/apps/guardian-ui/src/languages/en.json
+++ b/apps/guardian-ui/src/languages/en.json
@@ -15,7 +15,8 @@
     "threshold": "Threshold",
     "confirm": "Confirm",
     "you": "You",
-    "close": "Close"
+    "close": "Close",
+    "save": "Save"
   },
   "connect-guardians": {
     "invite-guardians": "Invite Followers",
@@ -70,12 +71,18 @@
       "no-gateways-info-title": "No connected gateways yet!",
       "no-gateways-info-description": "Lightning node operators can connect to your federation to provide Lightning Network interoperability. Once connected, they will appear here."
     },
+    "api-announcements": {
+      "label": "API Announcements",
+      "guardian": "Guardian",
+      "api-url": "API URL",
+      "revision": "Revision"
+    },
     "config": {
       "label": "Federation Config",
       "view-config": "View Config",
       "missing-meta-module": "Editing Meta fields is not possible. The Meta module is not available for this federation.",
       "manage-meta": {
-        "tab-label": "Manage Meta",
+        "label": "Manage Meta",
         "cancel-button": "Cancel",
         "confirm-modal": {
           "title": "Confirm Approval",
@@ -135,12 +142,14 @@
         "label": "Sign API Announcement",
         "title": "Sign API Announcement",
         "description": "Sign a new API announcement.",
-        "current-api-url": "API URL from Local Config",
-        "announced-api-url": "API URL from Federation Announcements",
+        "current-api-url": "Your API URL from Local Config",
+        "announced-api-url": "Your API URL from Federation Announcements",
+        "no-announcement": "No announcement found",
         "urls-match": "Your current API URL matches your announced API URL.",
         "urls-mismatch": "You've changed the API URL in your local config and need to broadcast a new API announcement.",
         "sign-button": "Sign new API announcement",
-        "signing-in-progress": "Signing in progress..."
+        "signing-in-progress": "Signing in progress...",
+        "sign-tooltip": "Sign the API announcement to announce your API URL to the federation."
       },
       "schedule-shutdown": {
         "label": "Schedule Shutdown",
@@ -298,7 +307,10 @@
     "table-column-hash-input": "Paste verification code",
     "wait-all-guardians-verification": "Waiting for all Guardians to verify their codes",
     "all-guardians-verified": "All Guardians have verified their codes",
-    "starting-consensus": "Starting consensus..."
+    "starting-consensus": "Starting consensus...",
+    "scanning-guardian": "Scan QR for {{guardian}}",
+    "stop-scan": "Stop Scan",
+    "start-scan": "Start Scan"
   },
   "footer": {
     "docs-section-header": "Docs",
diff --git a/apps/guardian-ui/src/utils/constants.ts b/apps/guardian-ui/src/utils/constants.ts
new file mode 100644
index 000000000..2dd18aae0
--- /dev/null
+++ b/apps/guardian-ui/src/utils/constants.ts
@@ -0,0 +1 @@
+export const QR_CODE_SIZE = 256;
diff --git a/apps/guardian-ui/src/utils/index.ts b/apps/guardian-ui/src/utils/index.ts
index 67cf22570..82708d827 100644
--- a/apps/guardian-ui/src/utils/index.ts
+++ b/apps/guardian-ui/src/utils/index.ts
@@ -37,6 +37,12 @@ export const generatePassword = () => {
 
 export const normalizeUrl = (url: string): string => {
   try {
+    // Check if the URL is in Docker-style format (e.g., fedimintd_2:18184)
+    const dockerStyleRegex = /^[\w-]+:\d+$/;
+    if (dockerStyleRegex.test(url)) {
+      return url; // Return as-is for Docker-style URLs
+    }
+
     // Parse the URL
     const parsedUrl = new URL(url);
 
@@ -45,24 +51,29 @@ export const normalizeUrl = (url: string): string => {
       ? parsedUrl.protocol
       : `${parsedUrl.protocol}:`;
 
-    // Combine parts, ensuring no double slashes between protocol and host
-    let normalizedUrl = `${protocol}//${parsedUrl.host}${parsedUrl.pathname}`;
+    // Extract only the port for IP addresses, localhost, or Docker-style hostnames
+    const isLocalOrIpOrDockerStyle = (hostname: string) =>
+      ['localhost', '127.0.0.1'].includes(hostname) ||
+      /^\d+\.\d+\.\d+\.\d+$/.test(hostname) ||
+      /^[\w-]+$/.test(hostname);
+
+    const host = isLocalOrIpOrDockerStyle(parsedUrl.hostname)
+      ? `:${parsedUrl.port}`
+      : parsedUrl.host;
 
-    // Remove trailing slash if present, unless it's the only character in the path
-    if (
-      normalizedUrl.endsWith('/') &&
-      normalizedUrl.length > protocol.length + 2
-    ) {
+    // Combine parts
+    let normalizedUrl = `${protocol}//${host}`;
+
+    // Remove trailing slash if present
+    if (normalizedUrl.endsWith('/')) {
       normalizedUrl = normalizedUrl.slice(0, -1);
     }
 
-    // Preserve query parameters and hash
-    normalizedUrl += parsedUrl.search + parsedUrl.hash;
-
     return normalizedUrl;
   } catch (error) {
     // If URL parsing fails, return the original string
-    console.warn(`Failed to normalize URL: ${url}`, error);
+    console.error(`Failed to normalize URL: ${url}`, error);
+    console.warn(`Returning original URL: ${url}`);
     return url;
   }
 };
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b9e26c51..85f25b798 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,6 @@ version: '3'
 
 services:
   fedimintd_1:
-    # Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
     image: fedimint/fedimintd:v0.4.0-rc.6
     environment:
       - FM_DATA_DIR=/data
@@ -10,8 +9,9 @@ services:
       - FM_P2P_URL=fedimint://fedimintd_1:18173
       - FM_BIND_API=0.0.0.0:18174
       - FM_API_URL=ws://fedimintd_1:18174
-      - FM_BITCOIN_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
-      - FM_BITCOIN_RPC_KIND=bitcoind
+      - FM_DEFAULT_BITCOIND_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
+      - FM_DEFAULT_BITCOIND_RPC_KIND=bitcoind
+      - FM_REL_NOTES_ACK=0_4_xyz
     ports:
       - '18174:18174'
     volumes:
@@ -20,7 +20,6 @@ services:
       - bitcoind
 
   gatewayd_1:
-    # Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
     image: fedimint/gatewayd:v0.4.0-rc.6
     command: gatewayd lnd
     environment:
@@ -49,7 +48,7 @@ services:
       - lnd_1
 
   lnd_1:
-    image: lightninglabs/lnd:v0.17.3-beta
+    image: lightninglabs/lnd:v0.18.2-beta
     ports:
       - '11009:11009'
     volumes:
@@ -60,7 +59,6 @@ services:
       - fedimintd_1
 
   fedimintd_2:
-    # Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
     image: fedimint/fedimintd:v0.4.0-rc.6
     environment:
       - FM_DATA_DIR=/data
@@ -68,8 +66,9 @@ services:
       - FM_P2P_URL=fedimint://fedimintd_2:18173
       - FM_BIND_API=0.0.0.0:18184
       - FM_API_URL=ws://fedimintd_2:18184
-      - FM_BITCOIN_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
-      - FM_BITCOIN_RPC_KIND=bitcoind
+      - FM_DEFAULT_BITCOIND_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
+      - FM_DEFAULT_BITCOIND_RPC_KIND=bitcoind
+      - FM_REL_NOTES_ACK=0_4_xyz
     ports:
       - '18184:18184'
     volumes:
@@ -84,7 +83,6 @@ services:
   #       ipv4_address: 10.5.0.8
 
   fedimintd_3:
-    # Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
     image: fedimint/fedimintd:v0.4.0-rc.6
     environment:
       - FM_DATA_DIR=/data
@@ -92,8 +90,9 @@ services:
       - FM_P2P_URL=fedimint://fedimintd_3:18174
       - FM_BIND_API=0.0.0.0:18185
       - FM_API_URL=ws://fedimintd_3:18185
-      - FM_BITCOIN_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
-      - FM_BITCOIN_RPC_KIND=bitcoind
+      - FM_DEFAULT_BITCOIND_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
+      - FM_DEFAULT_BITCOIND_RPC_KIND=bitcoind
+      - FM_REL_NOTES_ACK=0_4_xyz
     ports:
       - '18185:18185'
     volumes:
@@ -102,7 +101,6 @@ services:
       - bitcoind
 
   fedimintd_4:
-    # Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
     image: fedimint/fedimintd:v0.4.0-rc.6
     environment:
       - FM_DATA_DIR=/data
@@ -110,8 +108,9 @@ services:
       - FM_P2P_URL=fedimint://fedimintd_4:18175
       - FM_BIND_API=0.0.0.0:18186
       - FM_API_URL=ws://fedimintd_4:18186
-      - FM_BITCOIN_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
-      - FM_BITCOIN_RPC_KIND=bitcoind
+      - FM_DEFAULT_BITCOIND_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
+      - FM_DEFAULT_BITCOIND_RPC_KIND=bitcoind
+      - FM_REL_NOTES_ACK=0_4_xyz
     ports:
       - '18186:18186'
     volumes:
diff --git a/mprocs-rotate.yml b/mprocs-rotate.yml
new file mode 100644
index 000000000..0451e57cc
--- /dev/null
+++ b/mprocs-rotate.yml
@@ -0,0 +1,55 @@
+procs:
+  user:
+    shell: bash
+    stop: SIGKILL
+  start-servers:
+    shell: docker compose up
+  stop-servers-clear-data:
+    shell: docker compose down -v && echo 'Removing fm dirs' && sudo rm -rf fm_* && echo 'Done'
+    autostart: false
+  stop-servers-retain-data:
+    shell: docker compose down
+    autostart: false
+  guardian-ui-1:
+    shell: bash -c 'scripts/mprocs-rotate-guardian.sh 18174'
+    stop: SIGKILL
+    env:
+      PORT: '3000'
+      BROWSER: none
+  guardian-ui-2:
+    shell: bash -c 'scripts/mprocs-rotate-guardian.sh 18184'
+    stop: SIGKILL
+    env:
+      PORT: '3001'
+      BROWSER: none
+  guardian-ui-3:
+    shell: bash -c 'scripts/mprocs-rotate-guardian.sh 18185'
+    stop: SIGKILL
+    env:
+      PORT: '3002'
+      BROWSER: none
+  guardian-ui-4:
+    shell: bash -c 'scripts/mprocs-rotate-guardian.sh 18186'
+    stop: SIGKILL
+    env:
+      PORT: '3003'
+      BROWSER: none
+  restart-fedimintd:
+    shell: bash --init-file scripts/mprocs-restart-guardian.sh
+    autostart: false
+    stop: SIGKILL
+  gateway-ui:
+    shell: yarn dev:gateway-ui
+    env:
+      PORT: '3004'
+      REACT_APP_FM_GATEWAY_API: 'http://127.0.0.1:8175'
+      REACT_APP_FM_GATEWAY_PASSWORD: 'thereisnosecondbest'
+      BROWSER: none
+  fedimintd_1-logs:
+    shell: sleep 3 && docker logs -f fedimint-ui-fedimintd_1-1
+  fedimintd_2-logs:
+    shell: sleep 3 && docker logs -f fedimint-ui-fedimintd_2-1
+  fedimintd_3-logs:
+    shell: sleep 3 && docker logs -f fedimint-ui-fedimintd_3-1
+  fedimintd_4-logs:
+    shell: sleep 3 && docker logs -f fedimint-ui-fedimintd_4-1
diff --git a/original-docker-compose.yml b/original-docker-compose.yml
new file mode 100644
index 000000000..85f25b798
--- /dev/null
+++ b/original-docker-compose.yml
@@ -0,0 +1,172 @@
+version: '3'
+
+services:
+  fedimintd_1:
+    image: fedimint/fedimintd:v0.4.0-rc.6
+    environment:
+      - FM_DATA_DIR=/data
+      - FM_BIND_P2P=0.0.0.0:18173
+      - FM_P2P_URL=fedimint://fedimintd_1:18173
+      - FM_BIND_API=0.0.0.0:18174
+      - FM_API_URL=ws://fedimintd_1:18174
+      - FM_DEFAULT_BITCOIND_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
+      - FM_DEFAULT_BITCOIND_RPC_KIND=bitcoind
+      - FM_REL_NOTES_ACK=0_4_xyz
+    ports:
+      - '18174:18174'
+    volumes:
+      - ./fm_data/1/data:/data
+    depends_on:
+      - bitcoind
+
+  gatewayd_1:
+    image: fedimint/gatewayd:v0.4.0-rc.6
+    command: gatewayd lnd
+    environment:
+      # Path to folder containing gateway config and data files
+      - FM_GATEWAY_DATA_DIR=/gateway_data
+      # Gateway webserver listen address
+      - FM_GATEWAY_LISTEN_ADDR=0.0.0.0:8175
+      # Public URL from which the webserver API is reachable
+      - FM_GATEWAY_API_ADDR=http://gatewayd_1:8175
+      # Gateway webserver authentication password
+      - FM_GATEWAY_PASSWORD=thereisnosecondbest
+      # Configured gateway routing fees Format: <base_msat>,<proportional_millionths>
+      - FM_GATEWAY_FEES=0,1000
+      # LND RPC address
+      - FM_LND_RPC_ADDR=https://lnd_1:11009
+      # LND TLS cert file path
+      - FM_LND_TLS_CERT=/lnd_data/tls.cert
+      # LND macaroon file path
+      - FM_LND_MACAROON=/lnd_data/admin.macaroon
+    volumes:
+      - ./fm_data/gw:/gateway_data
+      - ./misc/test/data/data:/lnd_data
+    ports:
+      - '8175:8175'
+    depends_on:
+      - lnd_1
+
+  lnd_1:
+    image: lightninglabs/lnd:v0.18.2-beta
+    ports:
+      - '11009:11009'
+    volumes:
+      - ./misc/test/data:/root/.lnd
+      - ./misc/test/lnd.conf:/root/.lnd/lnd.conf
+    depends_on:
+      - bitcoind
+      - fedimintd_1
+
+  fedimintd_2:
+    image: fedimint/fedimintd:v0.4.0-rc.6
+    environment:
+      - FM_DATA_DIR=/data
+      - FM_BIND_P2P=0.0.0.0:18173
+      - FM_P2P_URL=fedimint://fedimintd_2:18173
+      - FM_BIND_API=0.0.0.0:18184
+      - FM_API_URL=ws://fedimintd_2:18184
+      - FM_DEFAULT_BITCOIND_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
+      - FM_DEFAULT_BITCOIND_RPC_KIND=bitcoind
+      - FM_REL_NOTES_ACK=0_4_xyz
+    ports:
+      - '18184:18184'
+    volumes:
+      - ./fm_data/2/data:/data
+    depends_on:
+      - bitcoind
+
+  # gatewayd_2:
+  #   image: fedimint/gatewayd:master
+  #   networks:
+  #     app_network:
+  #       ipv4_address: 10.5.0.8
+
+  fedimintd_3:
+    image: fedimint/fedimintd:v0.4.0-rc.6
+    environment:
+      - FM_DATA_DIR=/data
+      - FM_BIND_P2P=0.0.0.0:18174
+      - FM_P2P_URL=fedimint://fedimintd_3:18174
+      - FM_BIND_API=0.0.0.0:18185
+      - FM_API_URL=ws://fedimintd_3:18185
+      - FM_DEFAULT_BITCOIND_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
+      - FM_DEFAULT_BITCOIND_RPC_KIND=bitcoind
+      - FM_REL_NOTES_ACK=0_4_xyz
+    ports:
+      - '18185:18185'
+    volumes:
+      - ./fm_data/3/data:/data
+    depends_on:
+      - bitcoind
+
+  fedimintd_4:
+    image: fedimint/fedimintd:v0.4.0-rc.6
+    environment:
+      - FM_DATA_DIR=/data
+      - FM_BIND_P2P=0.0.0.0:18175
+      - FM_P2P_URL=fedimint://fedimintd_4:18175
+      - FM_BIND_API=0.0.0.0:18186
+      - FM_API_URL=ws://fedimintd_4:18186
+      - FM_DEFAULT_BITCOIND_RPC_URL=http://bitcoin:bitcoin@bitcoind:43782
+      - FM_DEFAULT_BITCOIND_RPC_KIND=bitcoind
+      - FM_REL_NOTES_ACK=0_4_xyz
+    ports:
+      - '18186:18186'
+    volumes:
+      - ./fm_data/4/data:/data
+    depends_on:
+      - bitcoind
+
+  bitcoind:
+    image: btcpayserver/bitcoin:26.0
+    environment:
+      BITCOIN_NETWORK: regtest
+      BITCOIN_EXTRA_ARGS: |
+        rpcport=43782
+        rpcbind=0.0.0.0:43782
+        port=39388
+        whitelist=0.0.0.0/0
+        rpcuser=bitcoin
+        rpcpassword=bitcoin
+        rpcallowip=0.0.0.0/0
+        fallbackfee=0.0004
+        txindex=1
+        server=1
+        zmqpubrawblock=tcp://0.0.0.0:38332
+        zmqpubrawtx=tcp://0.0.0.0:38333
+    expose:
+      - '43782'
+      - '39388'
+    ports:
+      - '43782:43782'
+      - '39388:39388'
+    volumes:
+      - './fm_data/bitcoin:/data'
+
+  # Uncomment me to test out Dockerfile.guardian-ui locally
+  # guardian_ui:
+  #   build:
+  #     context: .
+  #     dockerfile: Dockerfile.guardian-ui
+  #   environment:
+  #     - PORT=3001
+  #     - REACT_APP_FM_CONFIG_API=ws://localhost:18184
+  #   expose:
+  #     - '3001'
+  #   ports:
+  #     - '3001:3001'
+
+  # Uncomment me to test out Dockerfile.gateway-ui locally
+  # gateway_ui:
+  #   build:
+  #     context: .
+  #     dockerfile: Dockerfile.gateway-ui
+  #   environment:
+  #     - PORT=3002
+  #     - REACT_APP_FM_GATEWAY_API=http://127.0.0.1:8175
+  #     - REACT_APP_FM_GATEWAY_PASSWORD=thereisnosecondbest
+  #   expose:
+  #     - '3002'
+  #   ports:
+  #     - '3002:3002'
diff --git a/scripts/mprocs-nix.sh b/scripts/mprocs-nix.sh
index 4daa579b9..808d714ba 100755
--- a/scripts/mprocs-nix.sh
+++ b/scripts/mprocs-nix.sh
@@ -8,7 +8,8 @@ fi
 DEVIMINT_COMMAND=$1
 MPROCS_PATH=$2
 
-export FM_TEST_DIR="$TMP/fm-$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 4 || true)"
+TMP="${TMP:-/tmp}"
+export FM_TEST_DIR="${TMP}/fm-$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 4 || true)"
 export FM_FED_SIZE=4
 export FM_PID_FILE="$FM_TEST_DIR/.pid"
 export FM_LOGS_DIR="$FM_TEST_DIR/logs"
diff --git a/scripts/mprocs-restart-guardian.sh b/scripts/mprocs-restart-guardian.sh
new file mode 100644
index 000000000..21c888900
--- /dev/null
+++ b/scripts/mprocs-restart-guardian.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Function to get running fedimintd services
+get_running_fedimintds() {
+  docker-compose ps --services | grep 'fedimintd'
+}
+
+# Function to restart a fedimintd service with new ports
+restart_fedimintd() {
+  local service_name=$1
+  local new_port=$2
+
+  echo "Stopping $service_name..."
+  docker-compose stop "$service_name"
+  echo "Updating docker-compose.yml for $service_name with new port $new_port..."
+
+  # Update the docker-compose.yml file
+  awk -v service="$service_name" -v new_port="$new_port" '
+    $0 ~ service {in_service=1}
+    in_service && /ports:/ {
+      print
+      getline
+      sub(/[0-9]+:[0-9]+/, new_port ":" new_port)
+      print
+      next
+    }
+    in_service && /FM_API_URL=/ {
+      sub(/:[0-9]+/, ":" new_port)
+    }
+    in_service && /FM_BIND_API=/ {
+      sub(/:[0-9]+/, ":" new_port)
+    }
+    {print}
+    /^  [^ ]/ {in_service=0}
+  ' docker-compose.yml >docker-compose.yml.tmp && mv docker-compose.yml.tmp docker-compose.yml
+
+  echo "Starting $service_name with new api_url $new_port..."
+  docker-compose up -d "$service_name"
+
+  echo "Waiting for service to start..."
+  sleep 10
+
+  if docker-compose ps | grep -q "${service_name}.*Up"; then
+    echo "Service $service_name is running."
+    if docker-compose port "$service_name" "$new_port" >/dev/null 2>&1; then
+      echo "Service $service_name is listening on port $new_port."
+    else
+      echo "Warning: Service $service_name is not listening on port $new_port."
+    fi
+  else
+    echo "Error: Service $service_name failed to start."
+  fi
+
+  echo "Recent logs for $service_name:"
+  docker-compose logs --tail=10 "$service_name"
+}
+
+# Main script
+echo "Running fedimintd services:"
+mapfile -t services < <(get_running_fedimintds)
+
+for i in "${!services[@]}"; do
+  echo "$((i + 1)). ${services[i]}"
+done
+
+read -p "Enter the number of the service to restart: " choice
+
+if [[ "$choice" =~ ^[0-9]+$ ]] && [ "$choice" -ge 1 ] && [ "$choice" -le "${#services[@]}" ]; then
+  selected_service="${services[$((choice - 1))]}"
+  read -p "Enter the new API port for $selected_service: " new_port
+
+  if [[ "$new_port" =~ ^[0-9]+$ ]]; then
+    restart_fedimintd "$selected_service" "$new_port"
+  else
+    echo "Invalid port number. Please enter a valid number."
+  fi
+else
+  echo "Invalid choice. Please enter a number between 1 and ${#services[@]}."
+fi
diff --git a/scripts/mprocs-rotate-guardian.sh b/scripts/mprocs-rotate-guardian.sh
new file mode 100755
index 000000000..cb8e6e7e5
--- /dev/null
+++ b/scripts/mprocs-rotate-guardian.sh
@@ -0,0 +1,31 @@
+# shellcheck shell=bash
+set -eo pipefail
+
+validate_port() {
+  if ! [[ "$1" =~ ^[0-9]+$ ]] || [ "$1" -lt 1 ] || [ "$1" -gt 65535 ]; then
+    echo "Invalid port number."
+    exit 1
+  fi
+}
+
+# Check if a port number was provided as an argument
+if [ $# -eq 1 ]; then
+  read -p "Port $1 provided as argument. Press Enter to use this port or enter a different port: " input_port
+  if [[ -z "$input_port" ]]; then
+    CONFIG_PORT="$1"
+  else
+    CONFIG_PORT="$input_port"
+  fi
+else
+  # Prompt user for config port if no valid argument was provided
+  read -p "Enter the config port for the fedimintd to point at: " CONFIG_PORT
+fi
+
+# Validate the provided or entered port
+validate_port "$CONFIG_PORT"
+
+# Export the environment variable
+export REACT_APP_FM_CONFIG_API="ws://127.0.0.1:$CONFIG_PORT"
+
+# Start the guardian UI
+yarn dev:guardian-ui
diff --git a/testing.md b/testing.md
new file mode 100644
index 000000000..02c15a982
--- /dev/null
+++ b/testing.md
@@ -0,0 +1,66 @@
+### Testing Instructions
+
+#### Fedimint Guardian & Gateway UI End-to-End Testing Instructions
+
+In your nix dev-shell
+
+1. Run `just guardian` to spin up 4x guardians and UIs on ports :3000, :3001, :3002, :3003
+2. Walk through the setup process
+
+- PLEASE open issues for anything you run into here, this is the most important part to get right and seamless, and we're always looking to streamline this setup process
+
+3. After setup, connect the gateway with UI running on port :3004
+4. Set up a meta for the federation
+
+- From 1 guardian, propose a new meta with some key/values
+- Confirm on the other guardians, once a threshold is met it will set it as the new meta
+- Modify the meta from another guardian and propose the modifications
+- Confirm the meta modifications on the other guardians, once a threshold is met, it will set it as the new meta
+
+6. Peg in some bitcoin to the federation.
+
+- Pull a deposit address through the gateway UI
+- Send to it with `bitcoin-cli sendtoaddress 1 replace-this-with-address`
+- Mine some coins with `bitcoin-cli generatetoaddress 100 $(bitcoin-cli getnewaddress)`
+- Confirm the coins show up in the gateway-ui wallet
+- Confirm the coins show up in the guardian-ui balance sheet
+
+7. Peg out some bitcoin from the federation
+
+- get a new address with `bitcoin-cli getnewaddress`
+- From the gateway, start a withdraw to that address
+- Mine some coins with `bitcoin-cli generatetoaddress 100 $(bitcoin-cli getnewaddress)`
+- Confirm the coins are out of the gateway-ui wallet
+- Confirm the coins are off the guardian-ui balance sheet
+
+8. Coordinate a shutdown
+
+- From each of the guardian UIs, go to Danger Zone and use the Coordinate Shutdown button to set a session height to shutdown at. Give it ~10 sessions from the current session height
+- just send some coins back and forth on the gateway to keep the sessions coming until they shut down
+- confirm in the logs that the guardians all shut down at the same session height
+
+#### Test Guardian API Rotation
+
+We test this with docker so we can restart services on different ports, simulating changing DNS.
+
+1. Start the guardians up with `just rotate`, which will pull docker images for the latest fedimint and start an mprocs with some special sauce
+2. On each `guardian-ui` process, hit `Enter` to start on the default ports
+3. Go through the end to end setup process for the federation
+4. Restart the docker container: Once you're on the dashboard for all of them
+
+- hit `r` on the `restart-guardian` process to start the docker container restart logic.
+- Select which container you want to restart (e.g. 1 for fedimint_1)
+- Select which port to restart on (e.g. 13333)
+- Wait for the container to restart
+
+5. Confirm that the corresponding UI (e.g. :3000 for fedimint_1) can't connect when you refresh the page (since the port changed)
+6. On the corresponding UI process, hit `r` and enter the port you restarted the guardian's docker service on (e.g. 13333)
+7. Go back to the corresponding UI in your browser:
+
+- A modal should pop up saying you've changed the API_URL and you need to sign a new api announcement
+  - Modify the `127.0.0.1` to the container name (e.g. `ws://fedimint_1:13333` instead of `ws://127.0.0.1:13333`)
+- Click to sign the API announcement
+
+8. Confirm the updated API announcement reflects on the other guardians
+9. Refresh the gateway UI and confirm that it updates to open a ws with the guardian on its new port from the new api announcement
+10. Before committing anything, run `just reset dc` to reset the docker-compose that was modified during the api rotation testing by the scripts
diff --git a/yarn.lock b/yarn.lock
index cf608a4ce..74cdbca45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3251,6 +3251,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.27.tgz#d515767a4a7bc44eaec336ac7ff1bde338a17704"
   integrity sha512-GFfndd/RINWD19W+xNJ9Qh/sOZ5ieTiOSagA86ER/12i/l+MEnQxsbldGRF23azWjRfe7zUlAldyrwN84a1E5w==
 
+"@types/offscreencanvas@^2019.6.4":
+  version "2019.7.3"
+  resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.7.3.tgz#90267db13f64d6e9ccb5ae3eac92786a7c77a516"
+  integrity sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==
+
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -9178,6 +9183,13 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
+qr-scanner@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/qr-scanner/-/qr-scanner-1.4.2.tgz#bc4fb88022a8c9be95c49527a1c8fb8724b47dc4"
+  integrity sha512-kV1yQUe2FENvn59tMZW6mOVfpq9mGxGf8l6+EGaXUOd4RBOLg7tRC83OrirM5AtDvZRpdjdlXURsHreAOSPOUw==
+  dependencies:
+    "@types/offscreencanvas" "^2019.6.4"
+
 qrcode.react@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/qrcode.react/-/qrcode.react-3.1.0.tgz#5c91ddc0340f768316fbdb8fff2765134c2aecd8"