diff --git a/app/components/common/footer/component.html.erb b/app/components/common/footer/component.html.erb
index 444f23cc6..ba0d5f1cb 100644
--- a/app/components/common/footer/component.html.erb
+++ b/app/components/common/footer/component.html.erb
@@ -18,7 +18,7 @@
           </div>
           <div class="c-footer__highlight__contact">
             <span>
-              <%= render 'svg/email' %><a href="mailto:<%= Setting.find_by(code: 'contact_organization_email').retrieve %>"><%= Setting.find_by(code: 'contact_organization_email').retrieve %></a>
+              <%= render 'svg/email' %><a href="mailto:<%= Setting.find_by(code: 'contact_organization_email').retrieve %>"><%= Setting.find_by(code: 'contact_organization_email').retrieve %></a><br>
             </span>
             <span>
               <%= render 'svg/phone' %><a href="tel:<%= Setting.find_by(code: 'organization_phone').retrieve %>"><%= Setting.find_by(code: 'organization_phone').retrieve %></a>
@@ -39,14 +39,12 @@
             </span>
           </div>
           <div style="line-height: 23px;"><span style="color: rgb(255, 255, 255);"><b></b>
-              <span style="font-size: 13px;"><a href="https://internet.ee/domains/ee-domain-regulation" target="_self"><%= t('common.footer.domain_regulation')%></a></span>
-              <span style="font-size: 15px;"><br></span>
-              <span style="font-size: 13px;"><a href="https://internet.ee/help-and-info/faq" target="_self"><%= t('common.footer.faq')%></a> </span>
-              <span style="font-size: 13px;"><a href="https://internet.ee/help-and-info/statistics" target="_self"><%= t('common.footer.statistics')%></a></span>
-              <span style="font-size: 15px;"><br></span>
-              <span style="font-size: 13px;"><a href="<%= footer_link(:dispute_committee) %>" target="_self"><%= t('common.footer.dispute_committee') %></a></span>
+              <span style="font-size: 13px;"><a href="<%= footer_link(:domain_regulation) %>" target="_self"><%= t('common.footer.domain_regulation')%></a></span><br>
+              <span style="font-size: 13px;"><a href="<%= footer_link(:faq) %>" target="_self"><%= t('common.footer.faq')%></a> </span><br>
+              <span style="font-size: 13px;"><a href="<%= footer_link(:statistics) %>" target="_self"><%= t('common.footer.statistics')%></a></span><br>
+              <span style="font-size: 13px;"><a href="<%= footer_link(:dispute_committee) %>" target="_self"><%= t('common.footer.dispute_committee') %></a></span><br>
               <span style="font-size: 13px;"><a href="<%= Setting.find_by(code: 'terms_and_conditions_link').retrieve %>" target="_self"><%= t('auctions.top_grid.terms_and_conditions_link').capitalize %></a></span>
-              <b><span style="font-size: 15px;"><br></span></b>
+              <b><span style="font-size: 15px;"><br></span></b><br>
             </span>
           </div>
         </div>
@@ -71,12 +69,12 @@
           <div><b><span style="font-size: 14px;"><%= t('common.footer.estonian_internet') %> <br></span></b></div>
           <div><b><span style="font-size: 14px;"><br></span></b></div>
           <div>
-            <span style="font-size: 14px;"><a href="https://www.internet.ee/eif" target="_self"><%= t('common.footer.contact_us') %></a></span><br>
-            <span style="font-size: 14px;"><a href="https://www.internet.ee/eif/tasks-and-management" target="_self"><%= t('common.footer.management') %></a></span>
+            <span style="font-size: 14px;"><a href="<%= footer_link(:contact_us) %>" target="_self"><%= t('common.footer.contact_us') %></a></span><br>
+            <span style="font-size: 14px;"><a href="<%= footer_link(:management) %>" target="_self"><%= t('common.footer.management') %></a></span>
             <b><span style="font-size: 14px;"><br></span></b>
             <span style="font-size: 14px;">
-              <a href="https://www.internet.ee/eif/registrars-workgroup" target="_self">
-                <span style="color: rgb(251, 170, 25);"><%= t('common.footer.registrars_working_group') %></span>
+              <a href="<%= footer_link(:newsletter) %>" target="_self">
+                <span style="color: rgb(251, 170, 25);"><%= t('common.footer.newsletter') %></span>
               </a>
             </span><b>
             <span style="font-size: 14px;"><br></span></b>
diff --git a/app/components/common/footer/component.rb b/app/components/common/footer/component.rb
index 3481db72d..a613ae096 100644
--- a/app/components/common/footer/component.rb
+++ b/app/components/common/footer/component.rb
@@ -7,12 +7,19 @@ def footer_link(key) = if I18n.locale == :et
                                en_footer_links[key]
                              end
 
+      # rubocop:disable Metrics/MethodLength
       def et_footer_links
         {
           dispute_committee: 'https://www.internet.ee/domeenivaidlused/domeenivaidluste-komisjon',
           list_of_accredited_registrars: 'https://www.internet.ee/registripidaja/akrediteeritud-registripidajad',
           terms_and_conditions_for_registrars: 'https://www.internet.ee/registripidaja/kuidas-saada-ee-akrediteeritud-registripidajaks',
-          partner_programme: 'https://www.internet.ee/registripidaja/kuidas-saada-ee-elite-partneriks'
+          partner_programme: 'https://www.internet.ee/registripidaja/kuidas-saada-ee-elite-partneriks',
+          contact_us: 'https://www.internet.ee/eis',
+          management: 'https://www.internet.ee/eis/ulesanded-juhatus-ja-noukogu',
+          newsletter: 'https://www.internet.ee/eis/uudiskirjad',
+          domain_regulation: 'https://www.internet.ee/domeenid/ee-domeenireeglid',
+          faq: 'https://www.internet.ee/abi-ja-info/kkk',
+          statistics: 'https://www.internet.ee/abi-ja-info/statistika'
         }
       end
 
@@ -21,7 +28,13 @@ def en_footer_links
           dispute_committee: 'https://www.internet.ee/domain-disputes/domain-disputes-committee',
           list_of_accredited_registrars: 'https://www.internet.ee/registrar-portal/accredited-registrars',
           terms_and_conditions_for_registrars: 'https://www.internet.ee/registrar-portal/terms-and-conditions-for-becoming-a-registrar',
-          partner_programme: 'https://www.internet.ee/registrar-portal/become-a-ee-elite-partner'
+          partner_programme: 'https://www.internet.ee/registrar-portal/become-a-ee-elite-partner',
+          contact_us: 'https://www.internet.ee/eif',
+          management: 'https://www.internet.ee/eif/tasks-and-management',
+          newsletter: 'https://www.internet.ee/eif/newsletter',
+          domain_regulation: 'https://internet.ee/domains/ee-domain-regulation',
+          faq: 'https://internet.ee/help-and-info/faq',
+          statistics: 'https://internet.ee/help-and-info/statistics'
         }
       end
     end
diff --git a/config/locales/common.en.yml b/config/locales/common.en.yml
index 22fce6a1e..c067d3580 100644
--- a/config/locales/common.en.yml
+++ b/config/locales/common.en.yml
@@ -19,6 +19,7 @@ en:
       statistics: "Statistics"
       dispute_committee: "Domain Dispute Committee"
       status_page: "System status page"
+      newsletter: Newsletter
 
       registrars: "Registrars"
       list_of_accredited_registrars: "List of .ee accredited registrars"
diff --git a/config/locales/common.et.yml b/config/locales/common.et.yml
index 215afd069..d74786669 100644
--- a/config/locales/common.et.yml
+++ b/config/locales/common.et.yml
@@ -18,6 +18,7 @@ et:
       faq: "Korduma kippuvad küsimused"
       statistics: "Statistika"
       dispute_committee: "Domeenivaidluste Komisjon"
+      newsletter: Liitu uudiskirjaga!
 
       registrars: "Registripidajad"
       list_of_accredited_registrars: "Akrediteeritud registripidajate nimekiri"
diff --git a/test/components/common/footer_test.rb b/test/components/common/footer_test.rb
index eda559d00..87e895fc6 100644
--- a/test/components/common/footer_test.rb
+++ b/test/components/common/footer_test.rb
@@ -47,11 +47,11 @@ def test_render_component
       assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.estonian_internet')
       assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.contact_us')
       assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.management')
-      assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.registrars_working_group')
+      assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.newsletter')
     
       assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/eif"]'
       assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/eif/tasks-and-management"]'
-      assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/eif/registrars-workgroup"]'
+      assert_selector '.c-footer__row__col.s-footer-col a[href="https://www.internet.ee/eif/newsletter"]'
 
       assert_selector '.c-footer__row__col.s-footer-col', text: I18n.t('common.footer.social_media')