diff --git a/root-fs/app/bin/config/runJobs_conf.yaml b/root-fs/app/bin/config/runJobs_conf.yaml
index 9f3782d..347f974 100644
--- a/root-fs/app/bin/config/runJobs_conf.yaml
+++ b/root-fs/app/bin/config/runJobs_conf.yaml
@@ -1,7 +1,9 @@
 environment:
     php: "/usr/bin/php"
 wiki:
-    type: "###EDITION###"
+    # BlueSpice Neo is a farm. But paralle-runjobs-service has no setting for neo. Therefore we hardode it.
+    # This must be changed in a unified image for classic/neo
+    type: "farm"
     path: "/app/bluespice/w"
 database:
     dbserver: "###DB_HOST###"
diff --git a/root-fs/app/bin/init-datadirectory b/root-fs/app/bin/init-datadirectory
index 0d86169..f338331 100755
--- a/root-fs/app/bin/init-datadirectory
+++ b/root-fs/app/bin/init-datadirectory
@@ -19,7 +19,7 @@ directories=(
   /data/simplesamlphp/logs
 )
 
-if [ "${EDITION}" == "farm" ]; then
+if [ "${EDITION}" == "farm" ] || [ "${EDITION}" == "neo" ]; then
 	directories=(
   /data/bluespice/cache
   /data/bluespice/extensions/BlueSpiceFoundation/data
diff --git a/root-fs/app/bin/instancestats-show b/root-fs/app/bin/instancestats-show
index a27ac8d..94bf041 100755
--- a/root-fs/app/bin/instancestats-show
+++ b/root-fs/app/bin/instancestats-show
@@ -2,7 +2,7 @@
 
 run-maintenance BlueSpiceUsageTracker:showInstanceStats
 # Conditionally run for farm setups
-if [ "${EDITION}" == "farm" ]; then
+if [ "${EDITION}" == "farm" ] || [ "${EDITION}" == "neo" ]; then
 	run-maintenance BlueSpiceWikiFarm:RunForAll \
 		--script='extensions/BlueSpiceUsageTracker/maintenance/showInstanceStats.php'
 fi
diff --git a/root-fs/app/bin/instancestats-update b/root-fs/app/bin/instancestats-update
index 94bfcbf..d659c0b 100755
--- a/root-fs/app/bin/instancestats-update
+++ b/root-fs/app/bin/instancestats-update
@@ -2,7 +2,7 @@
 
 run-maintenance BlueSpiceUsageTracker:usageTrackerUpdate
 # Conditionally run for farm setups
-if [ "${EDITION}" == "farm" ]; then
+if [ "${EDITION}" == "farm" ] || [ "${EDITION}" == "neo" ]; then
 	run-maintenance BlueSpiceWikiFarm:RunForAll \
 		--script='extensions/BlueSpiceUsageTracker/maintenance/usageTrackerUpdate.php'
 fi
diff --git a/root-fs/app/bin/run-updates b/root-fs/app/bin/run-updates
index 8514cf3..f262882 100755
--- a/root-fs/app/bin/run-updates
+++ b/root-fs/app/bin/run-updates
@@ -35,7 +35,7 @@ run-maintenance update \
 
 echo $version > /data/bluespice/logs/baseversion
 
-if [ "${EDITION}" == "farm" ]; then
+if [ "${EDITION}" == "farm" ] || [ "${EDITION}" == "neo" ]; then
 	run-maintenance BlueSpiceWikiFarm:RunForAll \
 		--script='maintenance/update.php' \
 		--args='--quick --doshared' \
diff --git a/root-fs/app/conf/LocalSettings.php b/root-fs/app/conf/LocalSettings.php
index edb5d05..e843742 100644
--- a/root-fs/app/conf/LocalSettings.php
+++ b/root-fs/app/conf/LocalSettings.php
@@ -161,7 +161,7 @@
 $GLOBALS['wgCacheDirectory'] = "/data/bluespice/cache";
 define( 'BSROOTDIR', '/data/bluespice/extensions/BlueSpiceFoundation' );
 
-if ( getenv( 'EDITION' ) === 'farm' ) {
+if ( getenv( 'EDITION' ) === 'farm' || getenv( 'EDITION' ) === 'neo' ) {
 	$GLOBALS['wgWikiFarmConfig_instanceDirectory'] = '/data/bluespice/farm-instances/';
 	$GLOBALS['wgWikiFarmConfig_archiveDirectory'] = '/data/bluespice/farm-archives/';
 	$GLOBALS['wgWikiFarmConfig_dbAdminUser'] = trim( getenv( 'DB_ROOT_USER' ) ?: $GLOBALS['wgDBuser'] );
@@ -174,8 +174,16 @@
 	$GLOBALS['wgSharedTables'] = [ 'bs_translationtransfer_translations' ];
 }
 
+if ( getenv( 'EDITION' ) === 'neo' ) {
+	$GLOBALS['wgWikiFarmConfig_shareUsers'] = true;
+	$GLOBALS['wgWikiFarmConfig_useUnifiedSearch'] = true;
+	$GLOBALS['wgWikiFarmConfig_useGlobalAccessControl'] =true;
+	$GLOBALS['wgWikiFarmConfig_shareUserSessions'] = true;
+	$GLOBALS['wgWikiFarmConfig_useSharedResources'] = true;
+}
+
 require_once '/data/bluespice/pre-init-settings.php';
-if ( getenv( 'EDITION' ) === 'farm' ) {
+if ( getenv( 'EDITION' ) === 'farm' || getenv( 'EDITION' ) === 'neo' ) {
 	require_once "$IP/extensions/BlueSpiceWikiFarm/WikiFarm.setup.php";
 }
 else {
@@ -187,7 +195,7 @@
 }
 
 $GLOBALS['wgArticlePath'] = '/wiki/$1';
-if ( getenv( 'EDITION' ) === 'farm' ) {
+if ( getenv( 'EDITION' ) === 'farm' || getenv( 'EDITION' ) === 'neo' ) {
 	if( FARMER_IS_ROOT_WIKI_CALL === false ) {
 		$GLOBALS['wgArticlePath'] = '/' . FARMER_CALLED_INSTANCE . '/wiki/$1';
 		$GLOBALS['wgWebDAVBaseUri'] = '/' . FARMER_CALLED_INSTANCE . '/webdav/';