diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index a36a89f8f..a282b9e74 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -34,7 +34,7 @@ import { useGetDRepInfo, useWalletConnectionListener } from "./hooks";
 import { RegisterAsSoleVoter } from "./pages/RegisterAsSoleVoter";
 
 export default function App() {
-  const { enable, setDRep, setIsDrepLoading } = useCardano();
+  const { enable, setVoter, setIsDrepLoading } = useCardano();
   const navigate = useNavigate();
   const { data } = useGetDRepInfo();
   const { modal, openModal, modals } = useModal();
@@ -47,11 +47,11 @@ export default function App() {
 
   useEffect(() => {
     setIsDrepLoading(true);
-    setDRep(data);
+    setVoter(data);
     const timer = setTimeout(() => setIsDrepLoading(false), 1000);
 
     return () => clearTimeout(timer);
-  }, [data?.isRegistered]);
+  }, [data?.isRegisteredAsDRep, data?.isRegisteredAsSoleVoter]);
 
   const checkTheWalletIsActive = useCallback(() => {
     const hrefCondition =
diff --git a/govtool/frontend/src/components/atoms/VotingPowerChips.tsx b/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
index 897ec0ce8..ad707be93 100644
--- a/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
+++ b/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
@@ -13,7 +13,7 @@ import { correctAdaFormat } from "@utils";
 import { Tooltip } from "@atoms";
 
 export const VotingPowerChips = () => {
-  const { dRep, stakeKey, isDrepLoading } = useCardano();
+  const { voter, stakeKey, isDrepLoading } = useCardano();
   const { dRepVotingPower, isDRepVotingPowerLoading } =
     useGetDRepVotingPowerQuery();
   const { votingPower, powerIsLoading } =
@@ -33,7 +33,7 @@ export const VotingPowerChips = () => {
       alignItems="center"
       maxHeight={isMobile ? undefined : 48}
     >
-      {dRep?.isRegistered && (
+      {voter?.isRegisteredAsDRep && (
         <Tooltip
           heading={t("tooltips.votingPower.heading")}
           paragraphOne={t("tooltips.votingPower.paragraphOne")}
@@ -55,8 +55,8 @@ export const VotingPowerChips = () => {
           {t("votingPower")}
         </Typography>
       )}
-      {(dRep?.isRegistered && isDRepVotingPowerLoading) ||
-      (!dRep?.isRegistered && powerIsLoading) ||
+      {(voter?.isRegisteredAsDRep && isDRepVotingPowerLoading) ||
+      (!voter?.isRegisteredAsDRep && powerIsLoading) ||
       isDrepLoading ? (
         <CircularProgress size={20} color="primary" />
       ) : (
@@ -67,7 +67,7 @@ export const VotingPowerChips = () => {
           sx={{ whiteSpace: "nowrap" }}
         >
           ₳{" "}
-          {dRep?.isRegistered
+          {voter?.isRegisteredAsDRep
             ? correctAdaFormat(dRepVotingPower) ?? 0
             : correctAdaFormat(votingPower) ?? 0}
         </Typography>
diff --git a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
index 90cfce5ca..48bd969ec 100644
--- a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
+++ b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
@@ -112,7 +112,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
         ) : null}
         {inProgress && !isLoading ? (
           <Typography variant="title2" fontWeight={700}>
-            in progress
+            In Progress
           </Typography>
         ) : null}
         {description ? (
diff --git a/govtool/frontend/src/components/molecules/VoteActionForm.tsx b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
index 3c1645bd2..211d6ad50 100644
--- a/govtool/frontend/src/components/molecules/VoteActionForm.tsx
+++ b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
@@ -25,7 +25,7 @@ export const VoteActionForm = ({
   const [isContext, setIsContext] = useState<boolean>(false);
   const { isMobile, screenWidth } = useScreenDimension();
   const { openModal } = useModal();
-  const { dRep } = useCardano();
+  const { voter } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -142,7 +142,7 @@ export const VoteActionForm = ({
             />
           </Box>
         </Box>
-        {dRep?.isRegistered && (
+        {voter?.isRegisteredAsDRep && (
           <Button
             data-testid="show-votes-button"
             variant="text"
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 7019e8868..5736d8d5c 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -20,7 +20,7 @@ export const DashboardCards = () => {
     buildSignSubmitConwayCertTx,
     delegateTo,
     delegateTransaction,
-    dRep,
+    voter,
     dRepID,
     dRepIDBech32,
     isDrepLoading,
@@ -28,7 +28,6 @@ export const DashboardCards = () => {
     registerTransaction,
     soleVoterTransaction,
     stakeKey,
-    soleVoter,
   } = useCardano();
   const navigate = useNavigate();
   const { currentDelegation, isCurrentDelegationLoading } =
@@ -225,7 +224,7 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.registration.metadataUpdateInProgress");
       }
-    } else if (dRep?.isRegistered || dRep?.wasRegistered) {
+    } else if (voter?.isRegisteredAsDRep || voter?.wasRegisteredAsDRep) {
       return t("dashboard.registration.holdersCanDelegate");
     } else {
       return t("dashboard.registration.ifYouWant");
@@ -233,8 +232,30 @@ export const DashboardCards = () => {
   }, [
     registerTransaction.transactionHash,
     registerTransaction.type,
-    dRep?.isRegistered,
-    dRep?.wasRegistered,
+    voter?.isRegisteredAsDRep,
+    voter?.wasRegisteredAsDRep,
+  ]);
+
+  const soleVoterCardDescription = useMemo(() => {
+    if (soleVoterTransaction.transactionHash) {
+      switch (soleVoterTransaction.type) {
+        case "retirement":
+          return "dashboard.soleVoter.retirementInProgress";
+        default:
+          return "dashboard.soleVoter.registrationInProgress";
+      }
+    } else if (voter?.isRegisteredAsSoleVoter) {
+      return "dashboard.soleVoter.isRegisteredDescription";
+    } else if (voter?.wasRegisteredAsSoleVoter && !voter?.isRegisteredAsDRep) {
+      return "dashboard.soleVoter.wasRegisteredDescription";
+    } else {
+      return "dashboard.soleVoter.registerDescription";
+    }
+  }, [
+    soleVoterTransaction.transactionHash,
+    soleVoterTransaction.type,
+    voter?.isRegisteredAsSoleVoter,
+    voter?.wasRegisteredAsSoleVoter,
   ]);
 
   const registrationCardTitle = useMemo(() => {
@@ -247,9 +268,9 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.registration.dRepUpdate");
       }
-    } else if (dRep?.isRegistered) {
+    } else if (voter?.isRegisteredAsDRep) {
       return t("dashboard.registration.youAreRegistered");
-    } else if (dRep?.wasRegistered) {
+    } else if (voter?.wasRegisteredAsDRep) {
       return t("dashboard.registration.registerAgain");
     } else {
       return t("dashboard.registration.registerAsDRep");
@@ -257,8 +278,30 @@ export const DashboardCards = () => {
   }, [
     registerTransaction?.transactionHash,
     registerTransaction.type,
-    dRep?.isRegistered,
-    dRep?.wasRegistered,
+    voter?.isRegisteredAsDRep,
+    voter?.wasRegisteredAsDRep,
+  ]);
+
+  const soleVoterCardTitle = useMemo(() => {
+    if (soleVoterTransaction?.transactionHash) {
+      switch (soleVoterTransaction.type) {
+        case "retirement":
+          return t("dashboard.soleVoter.retirement");
+        default:
+          return t("dashboard.soleVoter.registration");
+      }
+    } else if (voter?.isRegisteredAsSoleVoter) {
+      return t("dashboard.soleVoter.youAreSoleVoterTitle");
+    } else if (voter?.wasRegisteredAsSoleVoter && !voter?.isRegisteredAsDRep) {
+      return t("dashboard.soleVoter.retireTitle");
+    } else {
+      return t("dashboard.soleVoter.registerTitle");
+    }
+  }, [
+    soleVoterTransaction?.transactionHash,
+    soleVoterTransaction.type,
+    voter?.isRegisteredAsSoleVoter,
+    voter?.isRegisteredAsSoleVoter,
   ]);
 
   return isDrepLoading ? (
@@ -340,25 +383,27 @@ export const DashboardCards = () => {
       {/* REGISTARTION AS DREP CARD */}
       <DashboardActionCard
         dataTestidFirstButton={
-          dRep?.isRegistered ? "retire-button" : "register-button"
+          voter?.isRegisteredAsDRep ? "retire-button" : "register-button"
         }
         dataTestidDrepIdBox="my-drep-id"
-        firstButtonVariant={dRep?.isRegistered ? "outlined" : "contained"}
+        firstButtonVariant={
+          voter?.isRegisteredAsDRep ? "outlined" : "contained"
+        }
         secondButtonVariant={
           registerTransaction?.transactionHash
             ? "outlined"
-            : dRep?.isRegistered
+            : voter?.isRegisteredAsDRep
             ? "text"
             : "outlined"
         }
         dataTestidSecondButton={
-          dRep?.isRegistered
+          voter?.isRegisteredAsDRep
             ? "change-metadata-button"
             : "register-learn-more-button"
         }
         description={registrationCardDescription}
         firstButtonAction={
-          dRep?.isRegistered
+          voter?.isRegisteredAsDRep
             ? retireAsDrep
             : () => navigateTo(PATHS.registerAsdRep)
         }
@@ -368,7 +413,7 @@ export const DashboardCards = () => {
             ? ""
             : t(
                 `dashboard.registration.${
-                  dRep?.isRegistered ? "retire" : "register"
+                  voter?.isRegisteredAsDRep ? "retire" : "register"
                 }`
               )
         }
@@ -377,7 +422,7 @@ export const DashboardCards = () => {
         secondButtonAction={
           registerTransaction?.transactionHash
             ? () => openInNewTab("https://adanordic.com/latest_transactions")
-            : dRep?.isRegistered
+            : voter?.isRegisteredAsDRep
             ? () => {
                 navigateTo(PATHS.updateMetadata);
               }
@@ -389,68 +434,69 @@ export const DashboardCards = () => {
         secondButtonLabel={
           registerTransaction?.transactionHash
             ? t("seeTransaction")
-            : dRep?.isRegistered
+            : voter?.isRegisteredAsDRep
             ? t("dashboard.registration.changeMetadata")
             : t("learnMore")
         }
-        cardId={dRep?.isRegistered || dRep?.wasRegistered ? dRepIDBech32 : ""}
+        cardId={
+          voter?.isRegisteredAsDRep || voter?.wasRegisteredAsDRep
+            ? dRepIDBech32
+            : ""
+        }
         cardTitle={
-          dRep?.isRegistered || dRep?.wasRegistered ? t("myDRepId") : ""
+          voter?.isRegisteredAsDRep || voter?.wasRegisteredAsDRep
+            ? t("myDRepId")
+            : ""
         }
         title={registrationCardTitle}
       />
       {/* DREP CARD END*/}
       {/* SOLE VOTER CARD */}
       <DashboardActionCard
-        dataTestidFirstButton={
-          soleVoter?.isRegistered
-            ? "retire-as-sole-voter-button"
-            : "register-as-sole-voter-button"
-        }
-        dataTestidSecondButton="learn-more-button"
+        title={soleVoterCardTitle}
+        inProgress={!!soleVoterTransaction?.transactionHash}
         description={
           <Trans
-            i18nKey={
-              soleVoter?.isRegistered
-                ? "dashboard.soleVoter.youAreSoleVoterDescription"
-                : "dashboard.soleVoter.registerAsSoleVoterDescription"
-            }
+            i18nKey={soleVoterCardDescription}
             values={{ votingPower: correctAdaFormat(votingPower) }}
           />
         }
+        firstButtonLabel={
+          soleVoterTransaction?.transactionHash
+            ? ""
+            : t(
+                voter?.isRegisteredAsSoleVoter
+                  ? "dashboard.soleVoter.retire"
+                  : voter?.wasRegisteredAsSoleVoter &&
+                    !voter?.isRegisteredAsDRep
+                  ? "dashboard.soleVoter.reRegister"
+                  : "dashboard.soleVoter.register"
+              )
+        }
         firstButtonAction={() =>
           navigateTo(
-            soleVoter?.isRegistered
+            voter?.isRegisteredAsSoleVoter
               ? PATHS.retireAsSoleVoter
               : PATHS.registerAsSoleVoter
           )
         }
-        firstButtonLabel={t(
-          soleVoter?.isRegistered
-            ? "dashboard.soleVoter.retire"
-            : "dashboard.soleVoter.register"
-        )}
-        firstButtonVariant={soleVoter?.isRegistered ? "outlined" : "contained"}
-        secondButtonVariant={
-          soleVoterTransaction?.transactionHash
-            ? "outlined"
-            : soleVoter?.isRegistered
-            ? "text"
-            : "outlined"
+        firstButtonVariant={
+          voter?.isRegisteredAsSoleVoter ? "outlined" : "contained"
         }
-        inProgress={!!soleVoterTransaction?.transactionHash}
-        imageURL={IMAGES.soleVoterImage}
+        secondButtonLabel={t("learnMore")}
         secondButtonAction={() =>
           openInNewTab(
             "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
           )
         }
-        secondButtonLabel={t("learnMore")}
-        title={t(
-          soleVoter?.isRegistered
-            ? "dashboard.soleVoter.youAreSoleVoterTitle"
-            : "dashboard.soleVoter.registerAsSoleVoterTitle"
-        )}
+        secondButtonVariant={"outlined"}
+        dataTestidFirstButton={
+          voter?.isRegisteredAsSoleVoter
+            ? "retire-as-sole-voter-button"
+            : "register-as-sole-voter-button"
+        }
+        dataTestidSecondButton="learn-more-button"
+        imageURL={IMAGES.soleVoterImage}
       />
       {/* REGISTARTION AS SOLE VOTER CARD END*/}
       {/* GOV ACTIONS LIST CARD */}
@@ -460,7 +506,7 @@ export const DashboardCards = () => {
         firstButtonAction={() => navigate(PATHS.dashboard_governance_actions)}
         firstButtonLabel={t(
           `dashboard.govActions.${
-            dRep?.isRegistered ? "reviewAndVote" : "view"
+            voter?.isRegisteredAsDRep ? "reviewAndVote" : "view"
           }`
         )}
         imageURL={IMAGES.govActionListImage}
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
index a15148f94..b197c3f6b 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
@@ -28,7 +28,7 @@ import {
 } from "@utils";
 
 export const DashboardGovernanceActionDetails = () => {
-  const { dRep } = useCardano();
+  const { voter } = useCardano();
   const { state, hash } = useLocation();
   const navigate = useNavigate();
   const { isMobile, screenWidth } = useScreenDimension();
@@ -134,7 +134,7 @@ export const DashboardGovernanceActionDetails = () => {
                 ? formatDisplayDate(state.expiryDate)
                 : formatDisplayDate(data.proposal.expiryDate)
             }
-            isDRep={dRep?.isRegistered}
+            isDRep={voter?.isRegisteredAsDRep}
             noVotes={state ? state.noVotes : data.proposal.noVotes}
             type={
               state
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
index d942dd9a4..a8d769f06 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
@@ -65,7 +65,7 @@ export const DashboardGovernanceActions = () => {
     state && state.isVotedListOnLoad ? 1 : 0
   );
 
-  const { dRep, isDrepLoading } = useCardano();
+  const { voter, isDrepLoading } = useCardano();
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
 
@@ -121,7 +121,7 @@ export const DashboardGovernanceActions = () => {
             sortingActive={Boolean(chosenSorting)}
             sortOpen={sortOpen}
           />
-          {dRep?.isRegistered && (
+          {voter?.isRegisteredAsDRep && (
             <Tabs
               sx={{
                 marginTop: 3,
diff --git a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
index b02a4c2ae..3b28a149c 100644
--- a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
@@ -29,7 +29,7 @@ export const DashboardTopNav = ({
   isVotingPowerHidden,
 }: DashboardTopNavProps) => {
   const { isMobile, screenWidth } = useScreenDimension();
-  const { dRep } = useCardano();
+  const { voter } = useCardano();
   const navigate = useNavigate();
   const [isDrawerOpen, setIsDrawerOpen] = useState<boolean>(false);
   const { t } = useTranslation();
@@ -168,7 +168,7 @@ export const DashboardTopNav = ({
                   </Grid>
                 </Grid>
               </Box>
-              {dRep?.isRegistered && <DRepInfoCard />}
+              {voter?.isRegisteredAsDRep && <DRepInfoCard />}
               <Box py={2} />
               <WalletInfoCard />
             </Box>
diff --git a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
index 2e333a0c1..f46a454c1 100644
--- a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
+++ b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
@@ -21,7 +21,7 @@ interface DelegateProps {
 export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
   const navigate = useNavigate();
   const {
-    dRep,
+    voter,
     dRepID,
     buildSignSubmitConwayCertTx,
     buildVoteDelegationCert,
@@ -133,7 +133,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
   }, [
     chosenOption,
     delegate,
-    dRep?.isRegistered,
+    voter?.isRegisteredAsDRep,
     dRepID,
     isDelegationLoading,
     isMobile,
@@ -215,7 +215,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
           flexDirection={"column"}
           rowGap={3}
         >
-          {dRep?.isRegistered && currentDelegation !== dRepID && (
+          {voter?.isRegisteredAsDRep && currentDelegation !== dRepID && (
             <Grid item>
               <ActionRadio
                 onChange={setChosenOption}
diff --git a/govtool/frontend/src/components/organisms/Drawer.tsx b/govtool/frontend/src/components/organisms/Drawer.tsx
index 922d920e9..914674bda 100644
--- a/govtool/frontend/src/components/organisms/Drawer.tsx
+++ b/govtool/frontend/src/components/organisms/Drawer.tsx
@@ -9,7 +9,7 @@ import { openInNewTab } from "@/utils";
 import { useTranslation } from "@hooks";
 
 export const Drawer = () => {
-  const { dRep } = useCardano();
+  const { voter } = useCardano();
   const { t } = useTranslation();
 
   return (
@@ -61,7 +61,7 @@ export const Drawer = () => {
           ))}
         </Grid>
         <Box px={2}>
-          {dRep?.isRegistered && <DRepInfoCard />}
+          {voter?.isRegisteredAsDRep && <DRepInfoCard />}
           <Box py={2} />
           <WalletInfoCard />
           <Box my={1}>
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
index a05bb424b..bb371f0c4 100644
--- a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
@@ -9,7 +9,7 @@ import { useCardano } from "@/context";
 export const RetireAsSoleVoterBoxContent = () => {
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
-  const { soleVoter } = useCardano();
+  const { voter } = useCardano();
 
   return (
     <>
@@ -29,7 +29,7 @@ export const RetireAsSoleVoterBoxContent = () => {
       >
         <Trans
           i18nKey="soleVoter.retirementDescription"
-          values={{ deposit: correctAdaFormat(soleVoter?.deposit) }}
+          values={{ deposit: correctAdaFormat(voter?.deposit) }}
           components={[
             <Link
               onClick={() => openInNewTab("https://sancho.network/")}
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index e07549a63..299a0dd3a 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -50,7 +50,7 @@ import { Trans } from "react-i18next";
 import { useModal, useSnackbar } from ".";
 
 import { PATHS } from "@consts";
-import { CardanoApiWallet, DRepInfo, Protocol } from "@models";
+import { CardanoApiWallet, VoterInfo, Protocol } from "@models";
 import type { StatusModalState } from "@organisms";
 import {
   getPubDRepID,
@@ -99,16 +99,14 @@ interface CardanoContext {
   disconnectWallet: () => Promise<void>;
   enable: (walletName: string) => Promise<EnableResponse>;
   error?: string;
-  dRep: DRepInfo | undefined;
-  soleVoter: DRepInfo | undefined;
-  setSoleVoter: (key: undefined | DRepInfo) => void;
+  voter: VoterInfo | undefined;
   isEnabled: boolean;
   pubDRepKey: string;
   dRepID: string;
   dRepIDBech32: string;
   isMainnet: boolean;
   stakeKey?: string;
-  setDRep: (key: undefined | DRepInfo) => void;
+  setVoter: (key: undefined | VoterInfo) => void;
   setStakeKey: (key: string) => void;
   stakeKeys: string[];
   walletApi?: CardanoApiWallet;
@@ -171,12 +169,7 @@ CardanoContext.displayName = "CardanoContext";
 
 function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
-  const [dRep, setDRep] = useState<DRepInfo | undefined>(undefined);
-  const [soleVoter, setSoleVoter] = useState<DRepInfo | undefined>({
-    deposit: 4000000,
-    isRegistered: false,
-    wasRegistered: false,
-  });
+  const [voter, setVoter] = useState<VoterInfo | undefined>(undefined);
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
   );
@@ -356,7 +349,7 @@ function CardanoProvider(props: Props) {
                 10,
                 dRepID,
                 registerTransaction.type,
-                setDRep
+                setVoter
               ).then((isRegistered) => {
                 if (registerTransaction.type === "registration") {
                   if (isRegistered) {
@@ -423,7 +416,7 @@ function CardanoProvider(props: Props) {
               10,
               dRepID,
               soleVoterTransaction.type,
-              setDRep
+              setVoter
             ).then((isRegistered) => {
               if (soleVoterTransaction.type === "registration") {
                 if (isRegistered) {
@@ -850,9 +843,9 @@ function CardanoProvider(props: Props) {
         // Add output of 1 ADA to the address of our wallet
         let outputValue = BigNum.from_str("1000000");
 
-        if (registrationType === "retirement" && dRep?.deposit) {
+        if (registrationType === "retirement" && voter?.deposit) {
           outputValue = outputValue.checked_add(
-            BigNum.from_str(`${dRep?.deposit}`)
+            BigNum.from_str(`${voter?.deposit}`)
           );
         }
 
@@ -1002,7 +995,7 @@ function CardanoProvider(props: Props) {
       voteTransaction.transactionHash,
       stakeKey,
       isPendingTransaction,
-      dRep,
+      voter,
     ]
   );
 
@@ -1151,7 +1144,7 @@ function CardanoProvider(props: Props) {
 
         const dRepRetirementCert = DrepDeregistration.new(
           dRepCred,
-          BigNum.from_str(`${dRep?.deposit}`)
+          BigNum.from_str(`${voter?.deposit}`)
         );
         // add cert to tbuilder
         certBuilder.add(
@@ -1163,7 +1156,7 @@ function CardanoProvider(props: Props) {
         console.log(e);
         throw e;
       }
-    }, [dRepID, dRep]);
+    }, [dRepID, voter]);
 
   const buildVote = useCallback(
     async (
@@ -1224,7 +1217,7 @@ function CardanoProvider(props: Props) {
     () => ({
       address,
       enable,
-      dRep,
+      voter,
       isEnabled,
       isMainnet,
       disconnectWallet,
@@ -1232,7 +1225,7 @@ function CardanoProvider(props: Props) {
       dRepIDBech32,
       pubDRepKey,
       stakeKey,
-      setDRep,
+      setVoter,
       setStakeKey,
       stakeKeys,
       walletApi,
@@ -1253,13 +1246,11 @@ function CardanoProvider(props: Props) {
       isPendingTransaction,
       isDrepLoading,
       setIsDrepLoading,
-      soleVoter,
-      setSoleVoter,
     }),
     [
       address,
       enable,
-      dRep,
+      voter,
       isEnabled,
       isMainnet,
       disconnectWallet,
@@ -1267,7 +1258,7 @@ function CardanoProvider(props: Props) {
       dRepIDBech32,
       pubDRepKey,
       stakeKey,
-      setDRep,
+      setVoter,
       setStakeKey,
       stakeKeys,
       walletApi,
@@ -1288,8 +1279,6 @@ function CardanoProvider(props: Props) {
       isPendingTransaction,
       isDrepLoading,
       setIsDrepLoading,
-      soleVoter,
-      setSoleVoter,
     ]
   );
 
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index e722e4c84..d68d8e7cf 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -1,13 +1,13 @@
 import { getAdaHolderCurrentDelegation, getDRepInfo } from "@services";
 import { DRepActionType } from "./wallet";
-import { DRepInfo } from "@models";
+import { VoterInfo } from "@models";
 
 export const setLimitedRegistrationInterval = (
   intervalTime: number,
   attemptsNumber: number,
   dRepID: string,
   transactionType: DRepActionType | Omit<DRepActionType, "update">,
-  setDRep: (key: undefined | DRepInfo) => void
+  setVoter: (key: undefined | VoterInfo) => void
 ): Promise<boolean> => {
   return new Promise(async (resolve) => {
     const desiredResult = transactionType === "registration" ? true : false;
@@ -20,8 +20,11 @@ export const setLimitedRegistrationInterval = (
         try {
           const data = await getDRepInfo(dRepID);
 
-          if (data.isRegistered === desiredResult) {
-            setDRep(data);
+          if (
+            data.isRegisteredAsDRep === desiredResult ||
+            data.isRegisteredAsSoleVoter === desiredResult
+          ) {
+            setVoter(data);
             clearInterval(interval);
             resolve(desiredResult);
           }
diff --git a/govtool/frontend/src/hooks/index.ts b/govtool/frontend/src/hooks/index.ts
index e17b56d3a..84e427cfa 100644
--- a/govtool/frontend/src/hooks/index.ts
+++ b/govtool/frontend/src/hooks/index.ts
@@ -6,5 +6,4 @@ export * from "./useFetchNextPageDetector";
 export * from "./useWalletConnectionListener";
 
 export * from "./forms";
-export * from "./mutations";
 export * from "./queries";
diff --git a/govtool/frontend/src/hooks/mutations/index.ts b/govtool/frontend/src/hooks/mutations/index.ts
deleted file mode 100644
index 7ab26f25b..000000000
--- a/govtool/frontend/src/hooks/mutations/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from "./useDRepRegisterMutation";
-export * from "./useDRepRemoveVoteMutation";
-export * from "./useDRepRetireMutation";
-export * from "./useAdaHolderDelegateMutation";
-export * from "./useAdaHolderDelegateAbstainMutation";
-export * from "./useAdaHolderDelegateNoMutation";
-export * from "./useAdaHolderRemoveDelegationMutation";
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts
deleted file mode 100644
index 9d37a5a01..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderDelegateAbstain } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderDelegateAbstainMutation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderDelegateAbstain, {});
-
-  return {
-    delegateAbstainAsAdaHolder: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts
deleted file mode 100644
index fe915c357..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderDelegate } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderDelegateMutation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderDelegate, {});
-
-  return {
-    delegateAsAdaHolder: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts
deleted file mode 100644
index 8491c4627..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderDelegateNo } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderDelegateNoMutation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderDelegateNo, {});
-
-  return {
-    delegateNoAsAdaHolder: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts
deleted file mode 100644
index 739a6b5e4..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderRemoveDelegation } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderRemoveDelegation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderRemoveDelegation);
-
-  return {
-    register: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
deleted file mode 100644
index 76b79287d..000000000
--- a/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useMutation } from "react-query";
-import { useCardano } from "@context";
-import { postDRepRegister } from "@services";
-
-export const useDRepRegisterMutation = () => {
-  const { setDRep } = useCardano();
-
-  const { mutateAsync, isLoading } = useMutation(postDRepRegister, {
-    onSuccess: () => {
-      setDRep({ deposit: 100, isRegistered: true, wasRegistered: false });
-    },
-  });
-
-  return {
-    isLoading: isLoading,
-    register: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts
deleted file mode 100644
index 7102ad95a..000000000
--- a/govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postDRepRemoveVote } from "@services";
-import { useMutation } from "react-query";
-
-export const useDRepRemoveVoteMutation = () => {
-  const { mutateAsync } = useMutation(postDRepRemoveVote);
-
-  return {
-    removeVote: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
deleted file mode 100644
index b3697c714..000000000
--- a/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useMutation } from "react-query";
-import { useCardano, useSnackbar } from "@context";
-import { postDRepRetire } from "@services";
-
-export const useDRepRetireMutation = () => {
-  const { setDRep } = useCardano();
-  const { addSuccessAlert } = useSnackbar();
-
-  const { mutateAsync } = useMutation(postDRepRetire, {
-    onSuccess: () => {
-      setDRep({ deposit: 100, wasRegistered: true, isRegistered: false });
-      addSuccessAlert("DRep retired.");
-    },
-  });
-
-  return {
-    retire: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index 889fa5be4..fe2860d58 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -101,13 +101,23 @@ export const en = {
         youAreRegistered: "You are Registered as a DRep",
       },
       soleVoter: {
+        isRegisteredDescription:
+          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
         register: "Register",
-        registerAsSoleVoterDescription:
+        registerDescription:
           "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
-        registerAsSoleVoterTitle: "Become a Sole Voter",
+        registerTitle: "Become a Sole Voter",
+        reRegister: "Re-register",
+        registration: "Sole Voter Registration",
+        registrationInProgress:
+          "The registration process is ongoing. This may take several minutes.",
         retire: "Retire",
-        youAreSoleVoterDescription:
-          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
+        retireTitle: "You Have Retired as a Sole Voter",
+        retirement: "Sole Voter Retirement",
+        wasRegisteredDescription:
+          "You cannot vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>. until you re-register.",
+        retirementInProgress:
+          "The retirement process is ongoing. This may take several minutes.",
         youAreSoleVoterTitle: "You are a Sole Voter",
       },
     },
@@ -320,14 +330,14 @@ export const en = {
       viewAll: "View all",
     },
     soleVoter: {
-      retireSoleVoter: "Retire as a Sole Voter",
       becomeSoleVoter: "Become a Sole Voter",
       registerDescription:
         "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
       registerHeading: "What this Means",
-      retirementHeading: "What Retirement Means",
       retirementDescription:
         "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
+      retirementHeading: "What Retirement Means",
+      retireSoleVoter: "Retire as a Sole Voter",
     },
     system: {
       sanchoNet: "SanchoNet",
diff --git a/govtool/frontend/src/models/api.ts b/govtool/frontend/src/models/api.ts
index 03fec9e2b..9f16b07ff 100644
--- a/govtool/frontend/src/models/api.ts
+++ b/govtool/frontend/src/models/api.ts
@@ -1,6 +1,8 @@
-export interface DRepInfo {
-  isRegistered: boolean;
-  wasRegistered: boolean;
+export interface VoterInfo {
+  isRegisteredAsDRep: boolean;
+  wasRegisteredAsDRep: boolean;
+  isRegisteredAsSoleVoter: boolean;
+  wasRegisteredAsSoleVoter: boolean;
   deposit: number;
 }
 
diff --git a/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx b/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
index 5097fd091..1fffa539d 100644
--- a/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
+++ b/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
@@ -38,7 +38,7 @@ export const DashboardGovernanceActionsCategory = () => {
   const [chosenSorting, setChosenSorting] = useState<string>("");
   const { isMobile, screenWidth } = useScreenDimension();
   const navigate = useNavigate();
-  const { dRep, isDrepLoading, voteTransaction } = useCardano();
+  const { voter, isDrepLoading, voteTransaction } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -88,7 +88,12 @@ export const DashboardGovernanceActionsCategory = () => {
         .toLowerCase()
         .includes(searchText.toLowerCase())
     );
-  }, [proposals, dRep?.isRegistered, searchText, isProposalsFetchingNextPage]);
+  }, [
+    proposals,
+    voter?.isRegisteredAsDRep,
+    searchText,
+    isProposalsFetchingNextPage,
+  ]);
 
   const closeSorts = useCallback(() => {
     setSortOpen(false);
diff --git a/govtool/frontend/src/pages/GovernanceActionsCategory.tsx b/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
index b7cd4982e..ef6c40a50 100644
--- a/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
+++ b/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
@@ -36,7 +36,7 @@ export const GovernanceActionsCategory = () => {
   const { isMobile, pagePadding, screenWidth } = useScreenDimension();
   const { isEnabled } = useCardano();
   const navigate = useNavigate();
-  const { dRep } = useCardano();
+  const { voter } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -86,7 +86,12 @@ export const GovernanceActionsCategory = () => {
         .toLowerCase()
         .includes(searchText.toLowerCase())
     );
-  }, [dRep?.isRegistered, isProposalsFetchingNextPage, proposals, searchText]);
+  }, [
+    voter?.isRegisteredAsDRep,
+    isProposalsFetchingNextPage,
+    proposals,
+    searchText,
+  ]);
 
   useEffect(() => {
     if (isEnabled && getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`)) {
diff --git a/govtool/frontend/src/services/requests/getDRepInfo.ts b/govtool/frontend/src/services/requests/getDRepInfo.ts
index 00925091e..869fcd337 100644
--- a/govtool/frontend/src/services/requests/getDRepInfo.ts
+++ b/govtool/frontend/src/services/requests/getDRepInfo.ts
@@ -1,9 +1,9 @@
 import { API } from "../API";
 
-import type { DRepInfo } from "@models";
+import type { VoterInfo } from "@models";
 
 export const getDRepInfo = async (dRepID: string) => {
-  const response = await API.get<DRepInfo>(`/drep/info/${dRepID}`);
+  const response = await API.get<VoterInfo>(`/drep/info/${dRepID}`);
 
   return response.data;
 };