diff --git a/group_vars/all/07_applications.yml b/group_vars/all/07_applications.yml
index 61a8d795..c74a4604 100644
--- a/group_vars/all/07_applications.yml
+++ b/group_vars/all/07_applications.yml
@@ -83,6 +83,12 @@ defaults_applications:
     css_enabled:                  "{{css_enabled_default}}"                 # Enables\Disables Global CSS Style
     landingpage_iframe_enabled:   "{{landingpage_iframe_enabled_default}}"  # Enables\Disables the possibility to embed this on landing page via iframe
 
+  # Chromium Browser
+  chromium:
+    plugins:                                                                                # Plugins to be installed in Chromium
+      - "cjpalhdlnbpafiamejdnhcphjbkeiagm;https://clients2.google.com/service/update2/crx"  # U-Block Origine Plugin
+      - "oboonakemofpalcgghocfoadofidjkkk;https://clients2.google.com/service/update2/crx"  # KeepassXC Plugin
+
   coturn:                     # @todo implement                
     credentials:
       user:       turnuser
@@ -109,6 +115,12 @@ defaults_applications:
     css_enabled:                  "{{css_enabled_default}}"                 # Enables\Disables Global CSS Style
     landingpage_iframe_enabled:   "true"                                    # Landingpage should be embeded in portfolio
 
+  # Firefox Browser
+  firefox:
+    plugins:                                                                                # Plugins to be installed in Firefox
+      - "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"      # U-Block Origine Plugin
+      - "https://addons.mozilla.org/firefox/downloads/latest/keepassxc-browser/latest.xpi"  # KeepassXC Plugin
+
   ## Friendica
   friendica:
     version:              "latest"
diff --git a/roles/pc-browser-chromium/files/extensions_policy.json b/roles/pc-browser-chromium/files/extensions_policy.json
deleted file mode 100644
index 0c15436e..00000000
--- a/roles/pc-browser-chromium/files/extensions_policy.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "ExtensionInstallForcelist": [
-      "cjpalhdlnbpafiamejdnhcphjbkeiagm;https://clients2.google.com/service/update2/crx",
-      "oboonakemofpalcgghocfoadofidjkkk;https://clients2.google.com/service/update2/crx"
-    ]
-  }
-  
\ No newline at end of file
diff --git a/roles/pc-browser-chromium/tasks/main.yml b/roles/pc-browser-chromium/tasks/main.yml
index 47732832..58877844 100644
--- a/roles/pc-browser-chromium/tasks/main.yml
+++ b/roles/pc-browser-chromium/tasks/main.yml
@@ -21,7 +21,7 @@
     mode: '0755'
 
 - name: Copy the extensions policy file for Chromium
-  copy:
-    src: extensions_policy.json
+  template:
+    src: extensions_policy.json.j2
     dest: /etc/chromium/policies/managed/extensions_policy.json
     mode: '0644'
diff --git a/roles/pc-browser-chromium/templates/extensions_policy.json.j2 b/roles/pc-browser-chromium/templates/extensions_policy.json.j2
new file mode 100644
index 00000000..7696059f
--- /dev/null
+++ b/roles/pc-browser-chromium/templates/extensions_policy.json.j2
@@ -0,0 +1,7 @@
+{
+  "ExtensionInstallForcelist": [
+    {% for plugin in applications[application_id].plugins -%}
+      "{{ plugin }}"{% if not loop.last %},{% endif %}
+    {% endfor %}
+  ]
+}
\ No newline at end of file
diff --git a/roles/pc-browser-firefox/files/policies.json b/roles/pc-browser-firefox/files/policies.json
deleted file mode 100644
index b6ab8177..00000000
--- a/roles/pc-browser-firefox/files/policies.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "policies": {
-      "Extensions": {
-        "Install": [
-          "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi",
-          "https://addons.mozilla.org/firefox/downloads/latest/keepassxc-browser/latest.xpi"
-        ]
-      }
-    }
-  }
-  
\ No newline at end of file
diff --git a/roles/pc-browser-firefox/tasks/main.yml b/roles/pc-browser-firefox/tasks/main.yml
index 21b4ea79..7f194e8e 100644
--- a/roles/pc-browser-firefox/tasks/main.yml
+++ b/roles/pc-browser-firefox/tasks/main.yml
@@ -11,7 +11,7 @@
     mode: '0755'
 
 - name: Deploy Firefox Enterprise Policies file
-  copy:
-    src: policies.json
+  template:
+    src: policies.json.j2
     dest: "{{ firefox_policy_file }}"
     mode: '0644'
diff --git a/roles/pc-browser-firefox/templates/policies.json.j2 b/roles/pc-browser-firefox/templates/policies.json.j2
new file mode 100644
index 00000000..fdccdd1d
--- /dev/null
+++ b/roles/pc-browser-firefox/templates/policies.json.j2
@@ -0,0 +1,12 @@
+{
+    "policies": {
+      "Extensions": {
+        "Install": [
+          {% for plugin in applications[application_id].plugins -%}
+            "{{ plugin }}"{% if not loop.last %},{% endif %}
+          {% endfor %}
+        ]
+      }
+    }
+  }
+  
\ No newline at end of file