diff --git a/app/Services/Features.php b/app/Services/Features.php
index d13542df..510a07d2 100644
--- a/app/Services/Features.php
+++ b/app/Services/Features.php
@@ -106,4 +106,14 @@ public static function isCode4RomaniaSite(): bool
     {
         return config('website-factory.edition') === 'internal';
     }
+
+    /**
+     * Determine if the application is running a government site.
+     *
+     * @return bool
+     */
+    public static function isGovernmentSite(): bool
+    {
+        return config('website-factory.edition') === 'minister';
+    }
 }
diff --git a/app/View/Components/Site/BannerGovernment.php b/app/View/Components/Site/BannerGovernment.php
new file mode 100644
index 00000000..46264351
--- /dev/null
+++ b/app/View/Components/Site/BannerGovernment.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\View\Components\Site;
+
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+class BannerGovernment extends Component
+{
+    public ?string $text;
+
+    public function __construct(?string $text = null)
+    {
+        $this->text = $text;
+    }
+
+    public function render(): View
+    {
+        return view('components.site.banner-government');
+    }
+
+    public function shouldRender(): bool
+    {
+        return ! config('website-factory.hide_banner') && ! \is_null($this->text);
+    }
+}
diff --git a/app/View/Components/Site/Footer.php b/app/View/Components/Site/Footer.php
index 60ccc2d0..a6f263c3 100644
--- a/app/View/Components/Site/Footer.php
+++ b/app/View/Components/Site/Footer.php
@@ -37,8 +37,8 @@ public function __construct()
 
     public function render(): View
     {
-        if (config('website-factory.edition') === 'minister') {
-            return view('components.site.footer-minister');
+        if (Features::isGovernmentSite()) {
+            return view('components.site.footer-government');
         }
 
         return view('components.site.footer');
@@ -52,6 +52,9 @@ public function banner(): ?string
 
         return __('banner.external', [
             'edition' => __('banner.edition.' . config('website-factory.edition')),
+            'organization' => Features::isGovernmentSite()
+                ? 'Code for Romania'
+                : 'Commit Global',
         ]);
     }
 }
diff --git a/app/View/Components/Site/Header.php b/app/View/Components/Site/Header.php
index 598221bd..0ea6a645 100644
--- a/app/View/Components/Site/Header.php
+++ b/app/View/Components/Site/Header.php
@@ -44,6 +44,8 @@ public function banner(): ?string
             return null;
         }
 
-        return __('banner.internal');
+        return __('banner.internal', [
+            'organization' => 'Commit Global',
+        ]);
     }
 }
diff --git a/lang/en/banner.php b/lang/en/banner.php
index 6fe5c92c..80932a44 100644
--- a/lang/en/banner.php
+++ b/lang/en/banner.php
@@ -4,8 +4,8 @@
 
 return [
 
-    'internal' => 'A Commit Global solution.',
-    'external' => 'Website built with Website Factory: :edition, a solution developed by Commit Global.',
+    'internal' => 'A :organization solution.',
+    'external' => 'Website built with Website Factory: :edition, a solution developed by :organization.',
 
     'edition' => [
         'primarie' => 'Primărie',
diff --git a/lang/ro/banner.php b/lang/ro/banner.php
index 90883911..f7032f42 100644
--- a/lang/ro/banner.php
+++ b/lang/ro/banner.php
@@ -4,8 +4,8 @@
 
 return [
 
-    'internal' => 'O soluție Commit Global.',
-    'external' => 'Website construit cu Website Factory: :edition, soluție dezvoltată de Commit Global.',
+    'internal' => 'O soluție :organization.',
+    'external' => 'Website construit cu Website Factory: :edition, soluție dezvoltată de :organization.',
 
     'edition' => [
         'primarie' => 'Primărie',
diff --git a/lang/ru/banner.php b/lang/ru/banner.php
index 1a63d5b8..cc04008c 100644
--- a/lang/ru/banner.php
+++ b/lang/ru/banner.php
@@ -5,7 +5,7 @@
 return [
 
     'internal' => 'Продукт Commit Global.',
-    'external' => 'Веб-сайт создан с помощью Website Factory: :edition, решения, разработанного Commit Global.',
+    'external' => 'Веб-сайт создан с помощью Website Factory: :edition, решения, разработанного :organization.',
 
     'edition' => [
         'primarie' => 'Primărie',
diff --git a/lang/uk/banner.php b/lang/uk/banner.php
index 843c67f1..98894ba2 100644
--- a/lang/uk/banner.php
+++ b/lang/uk/banner.php
@@ -4,8 +4,8 @@
 
 return [
 
-    'internal' => 'Продукт Commit Global.',
-    'external' => 'Веб-сайт, створений за допомогою Website Factory: :edition, рішення, розроблене Commit Global.',
+    'internal' => 'Продукт :organization.',
+    'external' => 'Веб-сайт, створений за допомогою Website Factory: :edition, рішення, розроблене :organization.',
 
     'edition' => [
         'primarie' => 'Primărie',
diff --git a/resources/views/components/site/banner-government.blade.php b/resources/views/components/site/banner-government.blade.php
new file mode 100644
index 00000000..12a4fa65
--- /dev/null
+++ b/resources/views/components/site/banner-government.blade.php
@@ -0,0 +1,13 @@
+<aside {{ $attributes }}>
+    <a
+        href="https://code4.ro"
+        target="_blank"
+        rel="noopener"
+        class="flex items-center w-auto gap-3 text-sm text-white/60 hover:text-white focus-visible:text-white focus:outline-0 hover:underline focus:underline"
+    >
+
+        <span>{{ $text }}</span>
+
+        <x-icon-code4 class="h-6 sm:h-8 shrink-0 fill-white/80" />
+    </a>
+</aside>
diff --git a/resources/views/components/site/footer-minister.blade.php b/resources/views/components/site/footer-government.blade.php
similarity index 73%
rename from resources/views/components/site/footer-minister.blade.php
rename to resources/views/components/site/footer-government.blade.php
index 1bff17eb..b4ef0377 100644
--- a/resources/views/components/site/footer-minister.blade.php
+++ b/resources/views/components/site/footer-government.blade.php
@@ -16,7 +16,8 @@
                             <x-dynamic-component
                                 class="text-sm font-semibold tracking-wider text-white uppercase hover:text-white/60 focus-visible:text-white/60"
                                 :component="$item->component"
-                                :item="$item" />
+                                :item="$item"
+                            />
 
                             @if ($item->children->count())
                                 <ul class="space-y-4">
@@ -25,7 +26,8 @@ class="text-sm font-semibold tracking-wider text-white uppercase hover:text-whit
                                             <x-dynamic-component
                                                 class="text-white/60 hover:text-white focus-visible:text-white"
                                                 :component="$item->component"
-                                                :item="$item" />
+                                                :item="$item"
+                                            />
                                         </li>
                                     @endforeach
                                 </ul>
@@ -36,10 +38,20 @@ class="text-white/60 hover:text-white focus-visible:text-white"
             </nav>
         </div>
 
-        <div class="pt-8 mt-8 border-t border-gray-200 md:flex md:items-center md:justify-between">
-            <x-social-media-links :links="$social" class="text-white md:order-2" />
+        <div
+            class="flex flex-col gap-4 pt-8 mt-8 border-t border-gray-200 md:flex-row md:items-center md:justify-between md:flex-wrap">
 
-            <p class="mt-8 text-white/60 md:mt-0 md:order-1">
+            <x-site.banner-government
+                :text="$banner()"
+                class="w-full"
+            />
+
+            <x-social-media-links
+                :links="$social"
+                class="text-white md:order-2"
+            />
+
+            <p class="text-white/60 md:mt-0 md:order-1">
                 &copy; {{ date('Y') }} {{ $title }}
             </p>
         </div>