diff --git a/Ghidra/Features/GhidraServer/Module.manifest b/Ghidra/Features/GhidraServer/Module.manifest
index 119be8ab89..070fe00556 100644
--- a/Ghidra/Features/GhidraServer/Module.manifest
+++ b/Ghidra/Features/GhidraServer/Module.manifest
@@ -1,2 +1,2 @@
-DATA SEARCH IGNORE DIR: yajsw-stable-13.09
+DATA SEARCH IGNORE DIR: yajsw-stable-13.12
 EXCLUDE FROM GHIDRA JAR: true
diff --git a/Ghidra/Features/GhidraServer/build.gradle b/Ghidra/Features/GhidraServer/build.gradle
index 731d198b9a..abfa67a369 100644
--- a/Ghidra/Features/GhidraServer/build.gradle
+++ b/Ghidra/Features/GhidraServer/build.gradle
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@ apply plugin: 'eclipse'
 
 eclipse.project.name = 'Features GhidraServer'
 
-def yajswRelease = "yajsw-stable-13.09"
+def yajswRelease = "yajsw-stable-13.12"
 
 configurations {
 	runGhidraServer
diff --git a/Ghidra/RuntimeScripts/Common/server/server.conf b/Ghidra/RuntimeScripts/Common/server/server.conf
index 5e44f2feed..82d675b3b9 100644
--- a/Ghidra/RuntimeScripts/Common/server/server.conf
+++ b/Ghidra/RuntimeScripts/Common/server/server.conf
@@ -214,12 +214,6 @@ wrapper.logfile.maxsize=10m
 #  files are deleted.  The default value of 0 implies no limit.
 wrapper.logfile.maxfiles=10
 
-#********************************************************************
-# Service Wrapper Linux Properties
-#********************************************************************
-# Force initd (systemd had issues during testing on Ubuntu 21.04 with yajsw-13.00)
-wrapper.daemon.system = initd
-
 #********************************************************************
 # Service Wrapper Windows Properties
 #********************************************************************
diff --git a/gradle/support/fetchDependencies.gradle b/gradle/support/fetchDependencies.gradle
index 3b7d5f33e3..95a004a2b0 100644
--- a/gradle/support/fetchDependencies.gradle
+++ b/gradle/support/fetchDependencies.gradle
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -82,9 +82,9 @@ ext.deps = [
 		destination: FLAT_REPO_DIR
 	],
 	[
-		name: "yajsw-stable-13.09.zip",
-		url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.09/yajsw-stable-13.09.zip",
-		sha256: "4dae732a535846ae5dfab753e82a4d5f93ad9a05a065e2172bb9774a1b15453a",
+		name: "yajsw-stable-13.12.zip",
+		url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.12/yajsw-stable-13.12.zip",
+		sha256: "c6fc59815d3800d14ec977926a8afd3f606a0ebd74d2cfd60601677466edeaa2",
 		destination: file("${DEPS_DIR}/GhidraServer")
 	],
 	[