diff --git a/CHANGELOG.md b/CHANGELOG.md
index b057d36..52d740e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -
 
 -->
-## [v4.1.1](https://github.com/TUDelftGeodesy/caroline/tree/main) (29-Sep-2026, [diff](https://github.com/TUDelftGeodesy/caroline/compare/dabf402171cf01887f4c8d32b3f33e7bc8d57138...main))
+## [v4.1.2](https://github.com/TUDelftGeodesy/caroline/tree/main) (01-Oct-2026, [diff](https://github.com/TUDelftGeodesy/caroline/compare/96e2f91d169598311129f271d3faf1eff36da917...main))
+
+### Changed
+- Plugins `cpxfiddle`, `depsi_v2.2.1.1`, `geocoding_v0.9`, `rdnaptrans` moved from `tarball` plugin to `github` plugin, with each in their own private repository within `TUDelftGeodesy`
+- Parameter `depsi_post:general:cpxfiddle-directory`: default changed from `'**CAROLINE_PLUGINS_DIRECTORY**/cpxfiddle'` to `'**CAROLINE_PLUGINS_DIRECTORY**/cpxfiddle/cpxfiddle'` to reflect new repository state
+
+### Fixed
+- Installation no longer crashes if no `github` or `tarball` plugins exist
+
+## [v4.1.1](https://github.com/TUDelftGeodesy/caroline/tree/96e2f91d169598311129f271d3faf1eff36da917) (29-Sep-2026, [diff](https://github.com/TUDelftGeodesy/caroline/compare/dabf402171cf01887f4c8d32b3f33e7bc8d57138...96e2f91d169598311129f271d3faf1eff36da917))
 
 ### Changed
 - `snap` now runs on 16 CPUs instead of 12
diff --git a/caroline/spider_install.py b/caroline/spider_install.py
index 5a93533..0d266d8 100644
--- a/caroline/spider_install.py
+++ b/caroline/spider_install.py
@@ -11,7 +11,12 @@ def _get_plugins() -> tuple[dict, dict]:
     plugins = get_config(f"{CONFIG['CAROLINE_INSTALL_DIRECTORY']}/config/plugin-definitions.yaml", flatten=False)
 
     github_plugins = plugins["github"]
+    if github_plugins is None:
+        github_plugins = {}
+
     tarball_plugins = plugins["tarball"]
+    if tarball_plugins is None:
+        tarball_plugins = {}
     for plugin in tarball_plugins.keys():
         if "**CAROLINE_PLUGINS_ARCHIVE_DIRECTORY**" in tarball_plugins[plugin]:
             tarball_plugins[plugin] = tarball_plugins[plugin].replace(
diff --git a/config/parameter-files/default-job-param-file-depsi_post.yaml b/config/parameter-files/default-job-param-file-depsi_post.yaml
index 2a42b84..36b5272 100644
--- a/config/parameter-files/default-job-param-file-depsi_post.yaml
+++ b/config/parameter-files/default-job-param-file-depsi_post.yaml
@@ -4,7 +4,7 @@ depsi_post:
   general:  # this job runs in the DePSI directories
     partition: 'normal'
     depsi_post-code-directory: '**CAROLINE_PLUGINS_DIRECTORY**/depsi_post_v2.1.4.0'
-    cpxfiddle-directory: '**CAROLINE_PLUGINS_DIRECTORY**/cpxfiddle'
+    cpxfiddle-directory: '**CAROLINE_PLUGINS_DIRECTORY**/cpxfiddle/cpxfiddle'
 
   depsi_post-settings:
     dlat: 0
diff --git a/config/plugin-definitions.yaml b/config/plugin-definitions.yaml
index 6e9f855..d0a508b 100644
--- a/config/plugin-definitions.yaml
+++ b/config/plugin-definitions.yaml
@@ -23,8 +23,20 @@ github:
     repo: "git@github.com:TUDelftGeodesy/snap-coregistration.git"
     branch: "caroline-clone-branch"
 
+  cpxfiddle:
+    repo: "git@github.com:TUDelftGeodesy/cpxfiddle.git"
+    branch: "main"
+
+  depsi_v2.2.1.1:
+    repo: "git@github.com:TUDelftGeodesy/caroline-matlab-depsi.git"
+    branch: "main"
+
+  geocoding_v0.9:
+    repo: "git@github.com:TUDelftGeodesy/caroline-matlab-geocoding.git"
+    branch: "main"
+
+  rdnaptrans:
+    repo: "git@github.com:TUDelftGeodesy/caroline-matlab-RDNAPtrans.git"
+    branch: "main"
+
 tarball:
-  cpxfiddle: "**CAROLINE_PLUGINS_ARCHIVE_DIRECTORY**/cpxfiddle.tar.gz"
-  depsi_v2.2.1.1: "**CAROLINE_PLUGINS_ARCHIVE_DIRECTORY**/depsi_v2.2.1.1.tar.gz"
-  geocoding_v0.9: "**CAROLINE_PLUGINS_ARCHIVE_DIRECTORY**/geocoding_v0.9.tar.gz"
-  rdnaptrans: "**CAROLINE_PLUGINS_ARCHIVE_DIRECTORY**/rdnaptrans.tar.gz"
diff --git a/pyproject.toml b/pyproject.toml
index 627a172..9b7f205 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Caroline"
-version = "4.1.1"
+version = "4.1.2"
 requires-python = ">=3.10"
 dependencies = [
     "apache-airflow",