diff --git a/bucket/gnupg.json b/bucket/gnupg.json
index 9ae5fb4c9e..172a405296 100644
--- a/bucket/gnupg.json
+++ b/bucket/gnupg.json
@@ -6,15 +6,18 @@
     "license": "GPL-3.0-or-later",
     "url": "https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-2.3.3_20211012.exe#/dl.7z",
     "hash": "1a85ab43a5e9ae86919c0cc639ffc96ddd76dc7b5e14295fbe4c282cbd447297",
-    "pre_install": [
-        "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\gnupg-uninstall.exe.nsis\" -Force -Recurse",
-        "New-Item \"$dir\\bin\\gpgconf.ctl\" -Force | Out-Null",
-        "if (!(Test-Path \"$persist_dir\\home\") -and (Test-Path \"$env:Appdata\\gnupg\")) {",
-        "    Write-Host -F yellow \"Copying old '$env:Appdata\\gnupg' to '$persist_dir\\home'\"",
-        "    New-Item \"$dir\\home\" -ItemType Directory -Force | Out-Null",
-        "    Copy-Item \"$env:Appdata\\gnupg\\*\" \"$dir\\home\" -Recurse -Force",
-        "}"
-    ],
+    "installer": {
+        "script": [
+            "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\gnupg-uninstall.exe.nsis\" -Force -Recurse",
+            "New-Item \"$dir\\bin\\gpgconf.ctl\" -Force | Out-Null",
+            "if (!(Test-Path \"$persist_dir\\home\") -and (Test-Path \"$env:Appdata\\gnupg\")) {",
+            "    Write-Host -F yellow \"Copying old '$env:Appdata\\gnupg' to '$persist_dir\\home'\"",
+            "    New-Item \"$dir\\home\" -ItemType Directory -Force | Out-Null",
+            "    Copy-Item \"$env:Appdata\\gnupg\\*\" \"$dir\\home\" -Recurse -Force",
+            "}",
+            "New-Item -ItemType \"directory\" -Path \"$dir\\gnupg\" -Force | Out-Null"
+        ]
+    },
     "env_add_path": "bin",
     "persist": "home",
     "checkver": {
diff --git a/bucket/gpg.json b/bucket/gpg.json
index 771fbf3ca7..c8776b7060 100644
--- a/bucket/gpg.json
+++ b/bucket/gpg.json
@@ -6,15 +6,18 @@
     "license": "GPL-3.0-or-later",
     "url": "https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-2.3.3_20211012.exe#/dl.7z",
     "hash": "1a85ab43a5e9ae86919c0cc639ffc96ddd76dc7b5e14295fbe4c282cbd447297",
-    "pre_install": [
-        "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\gnupg-uninstall.exe.nsis\" -Force -Recurse",
-        "New-Item \"$dir\\bin\\gpgconf.ctl\" -Force | Out-Null",
-        "if (!(Test-Path \"$persist_dir\\home\") -and (Test-Path \"$env:Appdata\\gnupg\")) {",
-        "    Write-Host -F yellow \"Copying old '$env:Appdata\\gnupg' to '$persist_dir\\home'\"",
-        "    New-Item \"$dir\\home\" -ItemType Directory -Force | Out-Null",
-        "    Copy-Item \"$env:Appdata\\gnupg\\*\" \"$dir\\home\" -Recurse -Force",
-        "}"
-    ],
+    "installer": {
+        "script": [
+            "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\gnupg-uninstall.exe.nsis\" -Force -Recurse",
+            "New-Item \"$dir\\bin\\gpgconf.ctl\" -Force | Out-Null",
+            "if (!(Test-Path \"$persist_dir\\home\") -and (Test-Path \"$env:Appdata\\gnupg\")) {",
+            "    Write-Host -F yellow \"Copying old '$env:Appdata\\gnupg' to '$persist_dir\\home'\"",
+            "    New-Item \"$dir\\home\" -ItemType Directory -Force | Out-Null",
+            "    Copy-Item \"$env:Appdata\\gnupg\\*\" \"$dir\\home\" -Recurse -Force",
+            "}",
+            "New-Item -ItemType \"directory\" -Path \"$dir\\gnupg\" -Force | Out-Null"
+        ]
+    },
     "env_add_path": "bin",
     "persist": "home",
     "checkver": {