diff --git a/src/main/scala/com/typesafe/sbt/packager/graalvmnativeimage/GraalVMNativeImagePlugin.scala b/src/main/scala/com/typesafe/sbt/packager/graalvmnativeimage/GraalVMNativeImagePlugin.scala
index 8bba3d7dd..e1ddbf3db 100644
--- a/src/main/scala/com/typesafe/sbt/packager/graalvmnativeimage/GraalVMNativeImagePlugin.scala
+++ b/src/main/scala/com/typesafe/sbt/packager/graalvmnativeimage/GraalVMNativeImagePlugin.scala
@@ -167,7 +167,7 @@ object GraalVMNativeImagePlugin extends AutoPlugin {
     * This can be used to build a custom build image starting from a custom base image. Can be used like so:
     *
     * ```
-    * (GraalVMNativeImage / containerBuildImage) := generateContainerBuildImage("my-docker-hub-username/my-graalvm").value
+    * GraalVMNativeImage / containerBuildImage := generateContainerBuildImage("my-docker-hub-username/my-graalvm").value
     * ```
     *
     * The passed in docker image must have GraalVM installed and on the PATH, including the gu utility.
diff --git a/src/main/scala/com/typesafe/sbt/packager/jdkpackager/JDKPackagerAntHelper.scala b/src/main/scala/com/typesafe/sbt/packager/jdkpackager/JDKPackagerAntHelper.scala
index 0119ebfe9..e4e19941e 100644
--- a/src/main/scala/com/typesafe/sbt/packager/jdkpackager/JDKPackagerAntHelper.scala
+++ b/src/main/scala/com/typesafe/sbt/packager/jdkpackager/JDKPackagerAntHelper.scala
@@ -186,7 +186,7 @@ object JDKPackagerAntHelper {
       sys.error(
         "Please set key `JDKPackager / antPackagerTasks` to `ant-javafx.jar` path, " +
           "which should be found in the `lib` directory of the Oracle JDK 8 installation. For example (Windows):\n" +
-          """(JDKPackager / antPackagerTasks) := Some(file("C:\\Program Files\\Java\\jdk1.8.0_45\\lib\\ant-javafx.jar"))"""
+          """JDKPackager / antPackagerTasks := Some(file("C:\\Program Files\\Java\\jdk1.8.0_45\\lib\\ant-javafx.jar"))"""
       )
 
     val taskClassPath = antTaskLib.get +: antExtraClasspath
diff --git a/src/sbt-test/debian/daemon-group-gid-deb/build.sbt b/src/sbt-test/debian/daemon-group-gid-deb/build.sbt
index 4209cc380..c095fe4ba 100644
--- a/src/sbt-test/debian/daemon-group-gid-deb/build.sbt
+++ b/src/sbt-test/debian/daemon-group-gid-deb/build.sbt
@@ -1,10 +1,10 @@
 enablePlugins(JavaServerAppPackaging, UpstartPlugin)
 
-(Linux / daemonUser) := "daemonuser"
-(Linux / daemonGroup) := "daemongroup"
-(Linux / daemonGroupGid) := Some("25000")
+Linux / daemonUser := "daemonuser"
+Linux / daemonGroup := "daemongroup"
+Linux / daemonGroupGid := Some("25000")
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 version := "0.1.0"
diff --git a/src/sbt-test/debian/daemon-user-deb/build.sbt b/src/sbt-test/debian/daemon-user-deb/build.sbt
index d3a2bec80..88c3a4f98 100644
--- a/src/sbt-test/debian/daemon-user-deb/build.sbt
+++ b/src/sbt-test/debian/daemon-user-deb/build.sbt
@@ -1,9 +1,9 @@
 enablePlugins(JavaServerAppPackaging)
 
-(Linux / daemonUser) := "daemonuser"
-(Linux / daemonGroup) := "daemongroup"
+Linux / daemonUser := "daemonuser"
+Linux / daemonGroup := "daemongroup"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 version := "0.1.0"
diff --git a/src/sbt-test/debian/daemon-user-homedir-deb/build.sbt b/src/sbt-test/debian/daemon-user-homedir-deb/build.sbt
index faf8e61bf..44e9ce262 100644
--- a/src/sbt-test/debian/daemon-user-homedir-deb/build.sbt
+++ b/src/sbt-test/debian/daemon-user-homedir-deb/build.sbt
@@ -1,10 +1,10 @@
 enablePlugins(JavaServerAppPackaging)
 
-(Linux / daemonUser) := "daemonuser"
-(Linux / daemonGroup) := "daemongroup"
-(Linux / daemonHome) := "/var/lib/customdaemonhome"
+Linux / daemonUser := "daemonuser"
+Linux / daemonGroup := "daemongroup"
+Linux / daemonHome := "/var/lib/customdaemonhome"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 version := "0.1.0"
diff --git a/src/sbt-test/debian/daemon-user-shell-deb/build.sbt b/src/sbt-test/debian/daemon-user-shell-deb/build.sbt
index 96a4e469b..43087417b 100644
--- a/src/sbt-test/debian/daemon-user-shell-deb/build.sbt
+++ b/src/sbt-test/debian/daemon-user-shell-deb/build.sbt
@@ -1,10 +1,10 @@
 enablePlugins(JavaServerAppPackaging)
 
-(Linux / daemonUser) := "daemonuser"
-(Linux / daemonGroup) := "daemongroup"
-(Linux / daemonShell) := "/bin/bash"
+Linux / daemonUser := "daemonuser"
+Linux / daemonGroup := "daemongroup"
+Linux / daemonShell := "/bin/bash"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 version := "0.1.0"
diff --git a/src/sbt-test/debian/daemon-user-uid-deb/build.sbt b/src/sbt-test/debian/daemon-user-uid-deb/build.sbt
index d06684912..c3169e7f5 100644
--- a/src/sbt-test/debian/daemon-user-uid-deb/build.sbt
+++ b/src/sbt-test/debian/daemon-user-uid-deb/build.sbt
@@ -1,10 +1,10 @@
 enablePlugins(JavaServerAppPackaging)
 
-(Linux / daemonUser) := "daemonuser"
-(Linux / daemonUserUid) := Some("20000")
-(Linux / daemonGroup) := "daemongroup"
+Linux / daemonUser := "daemonuser"
+Linux / daemonUserUid := Some("20000")
+Linux / daemonGroup := "daemongroup"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 version := "0.1.0"
diff --git a/src/sbt-test/debian/gen-changes/build.sbt b/src/sbt-test/debian/gen-changes/build.sbt
index feae5c547..065bd5614 100644
--- a/src/sbt-test/debian/gen-changes/build.sbt
+++ b/src/sbt-test/debian/gen-changes/build.sbt
@@ -15,4 +15,4 @@ Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)"
 
 Debian / debianPackageRecommends += "git"
 
-(Debian / debianChangelog) := Some(file("debian/changelog"))
+Debian / debianChangelog := Some(file("debian/changelog"))
diff --git a/src/sbt-test/debian/jdeb-conflicts/build.sbt b/src/sbt-test/debian/jdeb-conflicts/build.sbt
index ef3e518d9..eb5473769 100644
--- a/src/sbt-test/debian/jdeb-conflicts/build.sbt
+++ b/src/sbt-test/debian/jdeb-conflicts/build.sbt
@@ -11,7 +11,7 @@ packageSummary := "Test debian package"
 packageDescription := """A fun package description of our software,
   with multiple lines."""
 
-(Debian / debianPackageConflicts) := Seq("debian-test-package")
+Debian / debianPackageConflicts := Seq("debian-test-package")
 
 TaskKey[Unit]("checkConflicts") := {
   val extracted = target.value / "extracted"
diff --git a/src/sbt-test/debian/jdeb-dependencies/build.sbt b/src/sbt-test/debian/jdeb-dependencies/build.sbt
index 8e483a3b3..186923cf0 100644
--- a/src/sbt-test/debian/jdeb-dependencies/build.sbt
+++ b/src/sbt-test/debian/jdeb-dependencies/build.sbt
@@ -11,7 +11,7 @@ packageSummary := "Test debian package"
 packageDescription := """A fun package description of our software,
   with multiple lines."""
 
-(Debian / debianPackageDependencies) := Seq()
+Debian / debianPackageDependencies := Seq()
 
 TaskKey[Unit]("checkDependencies") := {
   val extracted = target.value / "extracted"
diff --git a/src/sbt-test/debian/jdeb-provides/build.sbt b/src/sbt-test/debian/jdeb-provides/build.sbt
index 60df0bf28..26b1e81d4 100644
--- a/src/sbt-test/debian/jdeb-provides/build.sbt
+++ b/src/sbt-test/debian/jdeb-provides/build.sbt
@@ -11,7 +11,7 @@ packageSummary := "Test debian package"
 packageDescription := """A fun package description of our software,
   with multiple lines."""
 
-(Debian / debianPackageProvides) := Seq("debian-test-package")
+Debian / debianPackageProvides := Seq("debian-test-package")
 
 TaskKey[Unit]("checkProvides") := {
   val extracted = target.value / "extracted"
diff --git a/src/sbt-test/debian/log-directory/build.sbt b/src/sbt-test/debian/log-directory/build.sbt
index a61691747..db54a0a68 100644
--- a/src/sbt-test/debian/log-directory/build.sbt
+++ b/src/sbt-test/debian/log-directory/build.sbt
@@ -1,8 +1,8 @@
 enablePlugins(JavaServerAppPackaging)
 
-(Debian / daemonUser) := "root"
+Debian / daemonUser := "root"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 
diff --git a/src/sbt-test/debian/native-build-compress/build.sbt b/src/sbt-test/debian/native-build-compress/build.sbt
index f7aa6a744..715c379f9 100644
--- a/src/sbt-test/debian/native-build-compress/build.sbt
+++ b/src/sbt-test/debian/native-build-compress/build.sbt
@@ -1,6 +1,6 @@
 enablePlugins(DebianPlugin)
 
-(Debian / debianNativeBuildOptions) := Nil
+Debian / debianNativeBuildOptions := Nil
 
 maintainer := "Maintainer <maintainer@example.com>"
 
diff --git a/src/sbt-test/debian/override-control-files/build.sbt b/src/sbt-test/debian/override-control-files/build.sbt
index e95e86d51..4115ff8e7 100644
--- a/src/sbt-test/debian/override-control-files/build.sbt
+++ b/src/sbt-test/debian/override-control-files/build.sbt
@@ -1,6 +1,6 @@
 enablePlugins(JavaServerAppPackaging, UpstartPlugin)
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 
@@ -10,16 +10,16 @@ maintainer := "Josh Suereth <joshua.suereth@typesafe.com>"
 
 packageSummary := "Test debian package"
 
-(Linux / daemonUser) := "root"
+Linux / daemonUser := "root"
 
-(Linux / daemonGroup) := "root"
+Linux / daemonGroup := "root"
 
 packageDescription := """A fun package description of our software,
   with multiple lines."""
 
 // add this to override all preexisting settings
 import DebianConstants._
-(Debian / maintainerScripts) := maintainerScriptsFromDirectory(
+Debian / maintainerScripts := maintainerScriptsFromDirectory(
   sourceDirectory.value / DebianSource / DebianMaintainerScripts,
   Seq(Preinst, Postinst, Prerm, Postrm)
 )
diff --git a/src/sbt-test/debian/override-etc-default/build.sbt b/src/sbt-test/debian/override-etc-default/build.sbt
index ae5e1cb7c..7d949d472 100644
--- a/src/sbt-test/debian/override-etc-default/build.sbt
+++ b/src/sbt-test/debian/override-etc-default/build.sbt
@@ -1,15 +1,15 @@
 enablePlugins(JavaServerAppPackaging, JDebPackaging, UpstartPlugin)
 
 // TODO change this after #437 is fixed
-(Linux / daemonUser) := "root"
+Linux / daemonUser := "root"
 
-(Linux / daemonGroup) := "app-group"
+Linux / daemonGroup := "app-group"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 
-(Debian / name) := "debian-test"
+Debian / name := "debian-test"
 
 version := "0.1.0"
 
diff --git a/src/sbt-test/debian/override-loader-functions/build.sbt b/src/sbt-test/debian/override-loader-functions/build.sbt
index 5e565324b..1f1b1d159 100644
--- a/src/sbt-test/debian/override-loader-functions/build.sbt
+++ b/src/sbt-test/debian/override-loader-functions/build.sbt
@@ -1,10 +1,10 @@
 enablePlugins(JavaServerAppPackaging, JDebPackaging, SystemdPlugin)
 
 // TODO change this after #437 is fixed
-(Linux / daemonUser) := "root"
-(Linux / daemonGroup) := "app-group"
+Linux / daemonUser := "root"
+Linux / daemonGroup := "app-group"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 version := "0.1.0"
diff --git a/src/sbt-test/debian/override-start-script-systemd/build.sbt b/src/sbt-test/debian/override-start-script-systemd/build.sbt
index 56e9be052..3476037b8 100644
--- a/src/sbt-test/debian/override-start-script-systemd/build.sbt
+++ b/src/sbt-test/debian/override-start-script-systemd/build.sbt
@@ -1,10 +1,10 @@
 enablePlugins(JavaServerAppPackaging, JDebPackaging, SystemdPlugin)
 
 // TODO change this after #437 is fixed
-(Linux / daemonUser) := "root"
-(Linux / daemonGroup) := "app-group"
+Linux / daemonUser := "root"
+Linux / daemonGroup := "app-group"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 version := "0.1.0"
diff --git a/src/sbt-test/debian/override-start-script-systemv/build.sbt b/src/sbt-test/debian/override-start-script-systemv/build.sbt
index bb742d1ae..7a083e20d 100644
--- a/src/sbt-test/debian/override-start-script-systemv/build.sbt
+++ b/src/sbt-test/debian/override-start-script-systemv/build.sbt
@@ -1,10 +1,10 @@
 enablePlugins(JavaServerAppPackaging, JDebPackaging, SystemVPlugin)
 
 // TODO change this after #437 is fixed
-(Linux / daemonUser) := "root"
-(Linux / daemonGroup) := "app-group"
+Linux / daemonUser := "root"
+Linux / daemonGroup := "app-group"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 version := "0.1.0"
diff --git a/src/sbt-test/debian/override-start-script-upstart/build.sbt b/src/sbt-test/debian/override-start-script-upstart/build.sbt
index 0f18280e2..ebbbe8ed8 100644
--- a/src/sbt-test/debian/override-start-script-upstart/build.sbt
+++ b/src/sbt-test/debian/override-start-script-upstart/build.sbt
@@ -1,10 +1,10 @@
 enablePlugins(JavaServerAppPackaging, JDebPackaging, UpstartPlugin)
 
 // TODO change this after #437 is fixed
-(Linux / daemonUser) := "root"
-(Linux / daemonGroup) := "app-group"
+Linux / daemonUser := "root"
+Linux / daemonGroup := "app-group"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 version := "0.1.0"
diff --git a/src/sbt-test/debian/systemd-deb/build.sbt b/src/sbt-test/debian/systemd-deb/build.sbt
index 38f18f58a..f253dbfb9 100644
--- a/src/sbt-test/debian/systemd-deb/build.sbt
+++ b/src/sbt-test/debian/systemd-deb/build.sbt
@@ -8,9 +8,9 @@ packageSummary := "Test debian package"
 packageDescription := """A fun package description of our software,
   with multiple lines."""
 
-(Debian / requiredStartFacilities) := Some("network.target")
+Debian / requiredStartFacilities := Some("network.target")
 
-(Linux / daemonUser) := "testuser"
+Linux / daemonUser := "testuser"
 
 Debian / systemdSuccessExitStatus += "1"
 
diff --git a/src/sbt-test/debian/sysvinit-deb/build.sbt b/src/sbt-test/debian/sysvinit-deb/build.sbt
index 786f0760a..66b17a698 100644
--- a/src/sbt-test/debian/sysvinit-deb/build.sbt
+++ b/src/sbt-test/debian/sysvinit-deb/build.sbt
@@ -1,8 +1,8 @@
 enablePlugins(JavaServerAppPackaging, SystemVPlugin)
 
-(Debian / daemonUser) := "root"
+Debian / daemonUser := "root"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 
@@ -17,7 +17,7 @@ packageDescription := """A fun package description of our software,
 
 requiredStartFacilities := Some("$test-service")
 
-(Debian / requiredStartFacilities) := Some("$test-deb-service")
+Debian / requiredStartFacilities := Some("$test-deb-service")
 
 daemonStdoutLogFile := Some("test.log")
 
diff --git a/src/sbt-test/debian/sysvinit-stoptimeouts-deb/build.sbt b/src/sbt-test/debian/sysvinit-stoptimeouts-deb/build.sbt
index 55ed3ca10..4630910f4 100644
--- a/src/sbt-test/debian/sysvinit-stoptimeouts-deb/build.sbt
+++ b/src/sbt-test/debian/sysvinit-stoptimeouts-deb/build.sbt
@@ -1,8 +1,8 @@
 enablePlugins(JavaServerAppPackaging, SystemVPlugin)
 
-(Debian / daemonUser) := "root"
+Debian / daemonUser := "root"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 
@@ -17,11 +17,11 @@ packageDescription := """A fun package description of our software,
 
 requiredStartFacilities := Some("$test-service")
 
-(Debian / requiredStartFacilities) := Some("$test-deb-service")
+Debian / requiredStartFacilities := Some("$test-deb-service")
 
-(Debian / termTimeout) := 10
+Debian / termTimeout := 10
 
-(Debian / killTimeout) := 20
+Debian / killTimeout := 20
 
 TaskKey[Unit]("checkControlFiles") := {
   val header = "#!/bin/sh"
diff --git a/src/sbt-test/debian/test-mapping/build.sbt b/src/sbt-test/debian/test-mapping/build.sbt
index 423db5193..df2d29f6f 100644
--- a/src/sbt-test/debian/test-mapping/build.sbt
+++ b/src/sbt-test/debian/test-mapping/build.sbt
@@ -2,9 +2,9 @@ enablePlugins(DebianPlugin)
 
 name := "debian-test"
 
-(Debian / name) := "debian-test-override"
+Debian / name := "debian-test-override"
 
-(Linux / packageName) := "debian-test-package"
+Linux / packageName := "debian-test-package"
 
 version := "0.1.0"
 
diff --git a/src/sbt-test/debian/test-packageName/build.sbt b/src/sbt-test/debian/test-packageName/build.sbt
index 9c1eeb836..496cd814c 100644
--- a/src/sbt-test/debian/test-packageName/build.sbt
+++ b/src/sbt-test/debian/test-packageName/build.sbt
@@ -2,9 +2,9 @@ enablePlugins(JavaServerAppPackaging)
 
 name := "debian-test"
 
-(Debian / name) := "debian-test-override"
+Debian / name := "debian-test-override"
 
-(Linux / packageName) := "debian-test-package"
+Linux / packageName := "debian-test-package"
 
 version := "0.1.0"
 
diff --git a/src/sbt-test/debian/upstart-deb-facilities/build.sbt b/src/sbt-test/debian/upstart-deb-facilities/build.sbt
index b0bd8addb..730ac22f2 100644
--- a/src/sbt-test/debian/upstart-deb-facilities/build.sbt
+++ b/src/sbt-test/debian/upstart-deb-facilities/build.sbt
@@ -1,12 +1,12 @@
 enablePlugins(JavaServerAppPackaging, UpstartPlugin)
 
-(Debian / daemonUser) := "root"
+Debian / daemonUser := "root"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 
-(Debian / name) := "debian-test"
+Debian / name := "debian-test"
 
 version := "0.1.0"
 
@@ -14,9 +14,9 @@ maintainer := "Josh Suereth <joshua.suereth@typesafe.com>"
 
 packageSummary := "Test debian package"
 
-(Debian / requiredStartFacilities) := Some("[networking]")
+Debian / requiredStartFacilities := Some("[networking]")
 
-(Debian / requiredStopFacilities) := Some("[networking]")
+Debian / requiredStopFacilities := Some("[networking]")
 
 packageDescription := """A fun package description of our software,
   with multiple lines."""
diff --git a/src/sbt-test/debian/upstart-deb/build.sbt b/src/sbt-test/debian/upstart-deb/build.sbt
index 094ca4a46..11447b89a 100644
--- a/src/sbt-test/debian/upstart-deb/build.sbt
+++ b/src/sbt-test/debian/upstart-deb/build.sbt
@@ -1,10 +1,10 @@
 enablePlugins(JavaServerAppPackaging, UpstartPlugin)
 
 // TODO change this after #437 is fixed
-(Linux / daemonUser) := "root"
-(Linux / daemonGroup) := "app-group"
+Linux / daemonUser := "root"
+Linux / daemonGroup := "app-group"
 
-(Compile / mainClass) := Some("empty")
+Compile / mainClass := Some("empty")
 
 name := "debian-test"
 version := "0.1.0"
diff --git a/src/sbt-test/docker/file-permission/changes/strategy-copychown.sbt b/src/sbt-test/docker/file-permission/changes/strategy-copychown.sbt
index 9ada10bad..8fb34e70b 100644
--- a/src/sbt-test/docker/file-permission/changes/strategy-copychown.sbt
+++ b/src/sbt-test/docker/file-permission/changes/strategy-copychown.sbt
@@ -4,5 +4,5 @@ dockerPermissionStrategy := DockerPermissionStrategy.CopyChown
 dockerBaseImage := "fabric8/java-centos-openjdk8-jdk"
 
 // opt-out of numeric USER
-(Docker / daemonUserUid) := None
-(Docker / daemonUser) := "daemon"
+Docker / daemonUserUid := None
+Docker / daemonUser := "daemon"
diff --git a/src/sbt-test/docker/file-permission/changes/strategy-none-gid.sbt b/src/sbt-test/docker/file-permission/changes/strategy-none-gid.sbt
index dcf8385e0..3ee082b4a 100644
--- a/src/sbt-test/docker/file-permission/changes/strategy-none-gid.sbt
+++ b/src/sbt-test/docker/file-permission/changes/strategy-none-gid.sbt
@@ -3,5 +3,5 @@ import com.typesafe.sbt.packager.docker._
 dockerPermissionStrategy := DockerPermissionStrategy.None
 dockerBaseImage := "fabric8/java-centos-openjdk8-jdk"
 
-(Docker / daemonGroupGid) := Some("5000")
-(Docker / daemonGroup) := "sbt"
+Docker / daemonGroupGid := Some("5000")
+Docker / daemonGroup := "sbt"
diff --git a/src/sbt-test/docker/test-busybox-create-user/build.sbt b/src/sbt-test/docker/test-busybox-create-user/build.sbt
index 6b4c974f0..cfd295456 100644
--- a/src/sbt-test/docker/test-busybox-create-user/build.sbt
+++ b/src/sbt-test/docker/test-busybox-create-user/build.sbt
@@ -6,7 +6,7 @@ version := "0.1.0"
 
 maintainer := "Boris Capitanu <borice@hotmail.com>"
 dockerBaseImage := "anapsix/alpine-java:8"
-(Docker / daemonUserUid) := Some("2000")
-(Docker / daemonUser) := "appuser"
-(Docker / daemonGroupGid) := Some("3000")
-(Docker / daemonGroup) := "appgroup"
+Docker / daemonUserUid := Some("2000")
+Docker / daemonUser := "appuser"
+Docker / daemonGroupGid := Some("3000")
+Docker / daemonGroup := "appgroup"
diff --git a/src/sbt-test/docker/test-executableScriptName/build.sbt b/src/sbt-test/docker/test-executableScriptName/build.sbt
index 878a40e39..e93b103d3 100644
--- a/src/sbt-test/docker/test-executableScriptName/build.sbt
+++ b/src/sbt-test/docker/test-executableScriptName/build.sbt
@@ -2,7 +2,7 @@ enablePlugins(JavaAppPackaging)
 
 name := "docker-test"
 
-(Docker / packageName) := "docker-package"
+Docker / packageName := "docker-package"
 
 executableScriptName := "docker-exec"
 
diff --git a/src/sbt-test/docker/test-layer-groups/changes/nolayers.sbt b/src/sbt-test/docker/test-layer-groups/changes/nolayers.sbt
index 1d8599520..63aca974f 100644
--- a/src/sbt-test/docker/test-layer-groups/changes/nolayers.sbt
+++ b/src/sbt-test/docker/test-layer-groups/changes/nolayers.sbt
@@ -1 +1 @@
-(Docker / dockerGroupLayers) := PartialFunction.empty
+Docker / dockerGroupLayers := PartialFunction.empty
diff --git a/src/sbt-test/docker/test-layer-groups/layers.sbt b/src/sbt-test/docker/test-layer-groups/layers.sbt
index 70ac22317..353d0ea8f 100644
--- a/src/sbt-test/docker/test-layer-groups/layers.sbt
+++ b/src/sbt-test/docker/test-layer-groups/layers.sbt
@@ -1,4 +1,4 @@
-(Docker / dockerGroupLayers) := {
+Docker / dockerGroupLayers := {
   val dockerBaseDirectory = (Docker / defaultLinuxInstallLocation).value
   (Docker / dockerGroupLayers).value.orElse {
     case (_, path) if path.startsWith(dockerBaseDirectory + "/spark/") => 54
diff --git a/src/sbt-test/docker/test-packageName/build.sbt b/src/sbt-test/docker/test-packageName/build.sbt
index 95dd8a22e..4ffd57103 100644
--- a/src/sbt-test/docker/test-packageName/build.sbt
+++ b/src/sbt-test/docker/test-packageName/build.sbt
@@ -4,7 +4,7 @@ organization := "com.example"
 name := "docker-test"
 
 // packageName := "docker-package" // sets the executable script, too
-(Docker / packageName) := "docker-package"
+Docker / packageName := "docker-package"
 
 version := "0.1.0"
 
diff --git a/src/sbt-test/jdkpackager/test-package-image/build.sbt b/src/sbt-test/jdkpackager/test-package-image/build.sbt
index 54d0076e2..0707d0db2 100644
--- a/src/sbt-test/jdkpackager/test-package-image/build.sbt
+++ b/src/sbt-test/jdkpackager/test-package-image/build.sbt
@@ -6,7 +6,7 @@ version := "0.1.0"
 
 organization := "com.foo.bar"
 
-(Compile / mainClass) := Some("ExampleApp")
+Compile / mainClass := Some("ExampleApp")
 
 maintainer := "Previously Owned Cats, Inc."
 
diff --git a/src/sbt-test/jdkpackager/test-package-mappings/build.sbt b/src/sbt-test/jdkpackager/test-package-mappings/build.sbt
index 795d9347f..9e184bf2f 100644
--- a/src/sbt-test/jdkpackager/test-package-mappings/build.sbt
+++ b/src/sbt-test/jdkpackager/test-package-mappings/build.sbt
@@ -6,7 +6,7 @@ version := "0.1.1"
 
 organization := "com.foo.bar"
 
-(Compile / mainClass) := Some("ExampleApp")
+Compile / mainClass := Some("ExampleApp")
 
 maintainer := "Cat D. Herder"
 
diff --git a/src/sbt-test/jdkpackager/test-package-minimal/build.sbt b/src/sbt-test/jdkpackager/test-package-minimal/build.sbt
index 8b61cd0ab..87c1909d6 100644
--- a/src/sbt-test/jdkpackager/test-package-minimal/build.sbt
+++ b/src/sbt-test/jdkpackager/test-package-minimal/build.sbt
@@ -2,7 +2,7 @@
 
 enablePlugins(JDKPackagerPlugin)
 
-(Compile / mainClass) := Some("ExampleApp")
+Compile / mainClass := Some("ExampleApp")
 
 jdkPackagerType := "image"
 
diff --git a/src/sbt-test/jlink/test-jlink-misc/build.sbt b/src/sbt-test/jlink/test-jlink-misc/build.sbt
index d21c9d3ce..8abb6fbd9 100644
--- a/src/sbt-test/jlink/test-jlink-misc/build.sbt
+++ b/src/sbt-test/jlink/test-jlink-misc/build.sbt
@@ -8,7 +8,7 @@ val runChecks = taskKey[Unit]("Run checks for a specific issue")
 val runFailingChecks = taskKey[Unit]("Run checks for a specific issue, expecting them to fail")
 
 // Exclude Scala by default to simplify the test.
-(ThisBuild / autoScalaLibrary) := false
+ThisBuild / autoScalaLibrary := false
 
 // Should succeed for multi-release artifacts
 val issue1243 = project
@@ -77,7 +77,7 @@ val issue1266 = project
 
       1.to(300000).map(mkPath)
     },
-    (jlinkModules / logLevel) := Level.Error,
+    jlinkModules / logLevel := Level.Error,
     runChecks := jlinkBuildImage.value
   )
 
diff --git a/src/sbt-test/jlink/test-jlink-missing-deps/build.sbt b/src/sbt-test/jlink/test-jlink-missing-deps/build.sbt
index 8aa56fcb3..1d357afc1 100644
--- a/src/sbt-test/jlink/test-jlink-missing-deps/build.sbt
+++ b/src/sbt-test/jlink/test-jlink-missing-deps/build.sbt
@@ -4,7 +4,7 @@ import scala.sys.process.Process
 import com.typesafe.sbt.packager.Compat._
 
 // Exclude Scala to simplify the test
-(ThisBuild / autoScalaLibrary) := false
+ThisBuild / autoScalaLibrary := false
 
 // Simulate a missing dependency (foo -> bar)
 lazy val foo = project.dependsOn(bar % "provided")
diff --git a/src/sbt-test/rpm/config-no-replace/build.sbt b/src/sbt-test/rpm/config-no-replace/build.sbt
index cd3998524..772876a33 100644
--- a/src/sbt-test/rpm/config-no-replace/build.sbt
+++ b/src/sbt-test/rpm/config-no-replace/build.sbt
@@ -21,7 +21,7 @@ rpmUrl := Some("http://github.com/sbt/sbt-native-packager")
 
 rpmLicense := Some("BSD")
 
-(Rpm / packageArchitecture) := "x86_64"
+Rpm / packageArchitecture := "x86_64"
 
 linuxPackageMappings := configWithNoReplace(linuxPackageMappings.value)
 
diff --git a/src/sbt-test/rpm/scriptlets-override-build-rpm/build.sbt b/src/sbt-test/rpm/scriptlets-override-build-rpm/build.sbt
index d8893be96..7a8d7c861 100644
--- a/src/sbt-test/rpm/scriptlets-override-build-rpm/build.sbt
+++ b/src/sbt-test/rpm/scriptlets-override-build-rpm/build.sbt
@@ -20,7 +20,7 @@ rpmUrl := Some("http://github.com/sbt/sbt-native-packager")
 
 rpmLicense := Some("BSD")
 
-(Rpm / maintainerScripts) := Map(
+Rpm / maintainerScripts := Map(
   Pre -> Seq("""echo "pre-install""""),
   Post -> Seq("""echo "post-install""""),
   Pretrans -> Seq("""echo "pretrans""""),
diff --git a/src/sbt-test/rpm/scriptlets-rpm/build.sbt b/src/sbt-test/rpm/scriptlets-rpm/build.sbt
index ccf12e618..e4f0c6421 100644
--- a/src/sbt-test/rpm/scriptlets-rpm/build.sbt
+++ b/src/sbt-test/rpm/scriptlets-rpm/build.sbt
@@ -23,7 +23,7 @@ rpmUrl := Some("http://github.com/sbt/sbt-native-packager")
 
 rpmLicense := Some("BSD")
 
-(Rpm / maintainerScripts) := Map(
+Rpm / maintainerScripts := Map(
   Pre -> Seq("""echo "pre-install""""),
   Post -> Seq("""echo "post-install""""),
   Pretrans -> Seq("""echo "pretrans""""),
diff --git a/src/sbt-test/rpm/setarch-rpm/build.sbt b/src/sbt-test/rpm/setarch-rpm/build.sbt
index 3aa8df5bb..7f2e542e6 100644
--- a/src/sbt-test/rpm/setarch-rpm/build.sbt
+++ b/src/sbt-test/rpm/setarch-rpm/build.sbt
@@ -7,7 +7,7 @@ version := "0.1.0"
 maintainer := "David Pennell <dpennell@good-cloud.com>"
 
 packageSummary := "Test rpm package"
-(Linux / packageName) := "rpm-package"
+Linux / packageName := "rpm-package"
 packageDescription := """A fun package description of our software,
   with multiple lines."""
 
@@ -15,7 +15,7 @@ rpmRelease := "1"
 rpmVendor := "typesafe"
 rpmUrl := Some("http://github.com/sbt/sbt-native-packager")
 rpmLicense := Some("BSD")
-(Rpm / packageArchitecture) := "i386"
+Rpm / packageArchitecture := "i386"
 
 rpmSetarch := Some("i386")
 
diff --git a/src/sbt-test/rpm/simple-rpm/build.sbt b/src/sbt-test/rpm/simple-rpm/build.sbt
index a2882de86..be5af2999 100644
--- a/src/sbt-test/rpm/simple-rpm/build.sbt
+++ b/src/sbt-test/rpm/simple-rpm/build.sbt
@@ -23,15 +23,15 @@ rpmLicense := Some("BSD")
 
 rpmEpoch := Some(1)
 
-(Rpm / packageArchitecture) := "x86_64"
+Rpm / packageArchitecture := "x86_64"
 
-(Rpm / linuxPackageMappings) := {
+Rpm / linuxPackageMappings := {
   val mapping1 = ((baseDirectory.value / "test"), "tmp/test")
   val mapping2 = ((baseDirectory.value / "build.sbt"), "/tmp/build.sbt")
   Seq(LinuxPackageMapping(Seq(mapping1, mapping2)))
 }
 
-(Rpm / defaultLinuxInstallLocation) := "/opt/foo"
+Rpm / defaultLinuxInstallLocation := "/opt/foo"
 
 TaskKey[Unit]("checkSpecFile") := {
   val spec = IO.read(target.value / "rpm" / "SPECS" / "rpm-test.spec")
diff --git a/src/sbt-test/rpm/snapshot-override-rpm/build.sbt b/src/sbt-test/rpm/snapshot-override-rpm/build.sbt
index 1ae9672bd..e4cf2b142 100644
--- a/src/sbt-test/rpm/snapshot-override-rpm/build.sbt
+++ b/src/sbt-test/rpm/snapshot-override-rpm/build.sbt
@@ -17,7 +17,7 @@ rpmUrl := Some("http://github.com/sbt/sbt-native-packager")
 
 rpmLicense := Some("BSD")
 
-(Rpm / version) := "1"
+Rpm / version := "1"
 
 TaskKey[Unit]("checkSnapshot") := {
   assert(rpmRelease.value == "SNAPSHOT", s"RPM has incorrect value ${rpmRelease.value}")
diff --git a/src/sbt-test/rpm/symlink-rpm/build.sbt b/src/sbt-test/rpm/symlink-rpm/build.sbt
index 2e5caf09e..714d7abc4 100644
--- a/src/sbt-test/rpm/symlink-rpm/build.sbt
+++ b/src/sbt-test/rpm/symlink-rpm/build.sbt
@@ -6,7 +6,7 @@ name := "rpm-test"
 version := "0.1.0"
 maintainer := "David Pennell <dpennell@good-cloud.com>"
 packageSummary := "Test rpm package"
-(Linux / packageName) := "rpm-package"
+Linux / packageName := "rpm-package"
 packageDescription :=
   """A fun package description of our software,
   with multiple lines."""
diff --git a/src/sbt-test/rpm/systemd-rpm/build.sbt b/src/sbt-test/rpm/systemd-rpm/build.sbt
index 948b00afc..4c1bb9517 100644
--- a/src/sbt-test/rpm/systemd-rpm/build.sbt
+++ b/src/sbt-test/rpm/systemd-rpm/build.sbt
@@ -16,7 +16,7 @@ rpmUrl := Some("http://github.com/sbt/sbt-native-packager")
 rpmLicense := Some("BSD")
 rpmGroup := Some("test-group")
 
-(Rpm / requiredStartFacilities) := Some("serviceA.service")
+Rpm / requiredStartFacilities := Some("serviceA.service")
 
 TaskKey[Unit]("unzip") := {
   val rpmPath = Seq((Rpm / packageBin).value.getAbsolutePath)
diff --git a/src/sbt-test/rpm/test-artifactPath/build.sbt b/src/sbt-test/rpm/test-artifactPath/build.sbt
index 67433321a..bb45f2ee4 100644
--- a/src/sbt-test/rpm/test-artifactPath/build.sbt
+++ b/src/sbt-test/rpm/test-artifactPath/build.sbt
@@ -8,7 +8,7 @@ maintainer := "Josh Suereth <joshua.suereth@typesafe.com>"
 
 packageSummary := "Test rpm package"
 
-(Linux / packageName) := "rpm-package"
+Linux / packageName := "rpm-package"
 
 (Rpm / packageBin / artifactPath) := target.value / s"${(Rpm / packageName).value}-${(Rpm / version).value}.rpm"
 
diff --git a/src/sbt-test/rpm/test-packageName/build.sbt b/src/sbt-test/rpm/test-packageName/build.sbt
index 1a734d945..bb454ba58 100644
--- a/src/sbt-test/rpm/test-packageName/build.sbt
+++ b/src/sbt-test/rpm/test-packageName/build.sbt
@@ -8,7 +8,7 @@ maintainer := "Josh Suereth <joshua.suereth@typesafe.com>"
 
 packageSummary := "Test rpm package"
 
-(Linux / packageName) := "rpm-package"
+Linux / packageName := "rpm-package"
 
 packageDescription := """A fun package description of our software,
   with multiple lines."""
diff --git a/src/sbt-test/universal/multiproject-classifiers/build.sbt b/src/sbt-test/universal/multiproject-classifiers/build.sbt
index 94821e373..6b99f2fd6 100644
--- a/src/sbt-test/universal/multiproject-classifiers/build.sbt
+++ b/src/sbt-test/universal/multiproject-classifiers/build.sbt
@@ -23,7 +23,7 @@ lazy val sub = project
   .settings(mySettings)
   .settings(
     ivyConfigurations += Assets,
-    (Assets / artifact) := artifact.value.withClassifier(classifier = Some("assets")),
+    Assets / artifact := artifact.value.withClassifier(classifier = Some("assets")),
     packagedArtifacts += {
       val file = target.value / "assets.jar"
       val assetsDir = baseDirectory.value / "src" / "main" / "assets"
@@ -31,7 +31,7 @@ lazy val sub = project
       IO.zip(sources, file)
       (Assets / artifact).value -> file
     },
-    (Assets / exportedProducts) := {
+    Assets / exportedProducts := {
       Seq(
         Attributed
           .blank(baseDirectory.value / "src" / "main" / "assets")
diff --git a/src/sbt-test/universal/publish/build.sbt b/src/sbt-test/universal/publish/build.sbt
index 0ddd92ba6..0fca7bbd1 100644
--- a/src/sbt-test/universal/publish/build.sbt
+++ b/src/sbt-test/universal/publish/build.sbt
@@ -12,6 +12,6 @@ resolvers += testResolver
 resolvers += Resolver.mavenLocal
 
 // Workaround for overwriting packages at .m2 directory
-(ThisBuild / isSnapshot) := true
+ThisBuild / isSnapshot := true
 
-(Universal / publishTo) := Some(testResolver)
+Universal / publishTo := Some(testResolver)
diff --git a/src/sbt-test/universal/staging-custom-main/build.sbt b/src/sbt-test/universal/staging-custom-main/build.sbt
index 16c467bc8..f9d5789f3 100644
--- a/src/sbt-test/universal/staging-custom-main/build.sbt
+++ b/src/sbt-test/universal/staging-custom-main/build.sbt
@@ -6,7 +6,7 @@ name := "stage-custom-main"
 
 version := "0.1.0"
 
-(Compile / mainClass) := Some("Main")
+Compile / mainClass := Some("Main")
 
 TaskKey[Unit]("unzip") := {
   val args = Seq((Universal / packageBin).value.getAbsolutePath)
diff --git a/src/sbt-test/universal/test-packageName/build.sbt b/src/sbt-test/universal/test-packageName/build.sbt
index 97cd3226d..a94707bcf 100644
--- a/src/sbt-test/universal/test-packageName/build.sbt
+++ b/src/sbt-test/universal/test-packageName/build.sbt
@@ -2,6 +2,6 @@ enablePlugins(JavaAppPackaging)
 
 name := "simple-test"
 
-(Universal / packageName) := "simple-package"
+Universal / packageName := "simple-package"
 
 version := "0.1.0"
diff --git a/src/sbt-test/universal/test-zips/build.sbt b/src/sbt-test/universal/test-zips/build.sbt
index 0a188c5e9..de62e9544 100644
--- a/src/sbt-test/universal/test-zips/build.sbt
+++ b/src/sbt-test/universal/test-zips/build.sbt
@@ -4,5 +4,5 @@ name := "simple-test"
 version := "0.1.0"
 
 // add some mappings
-(UniversalSrc / mappings) := (Universal / mappings).value
-(UniversalDocs / mappings) := (Universal / mappings).value
+UniversalSrc / mappings := (Universal / mappings).value
+UniversalDocs / mappings := (Universal / mappings).value
diff --git a/src/sbt-test/windows/custom-wix/build.sbt b/src/sbt-test/windows/custom-wix/build.sbt
index e4a7f6274..3fb8fb142 100644
--- a/src/sbt-test/windows/custom-wix/build.sbt
+++ b/src/sbt-test/windows/custom-wix/build.sbt
@@ -4,7 +4,7 @@ name := "custom-wix"
 version := "0.1.0"
 
 // make sure we don't somehow use the generated script
-(Windows / wixFile) := {
+Windows / wixFile := {
   sys.error("wixFile shouldn't have been called")
 }
 
diff --git a/src/sbt-test/windows/test-custom-main/build.sbt b/src/sbt-test/windows/test-custom-main/build.sbt
index 903352741..63c31d49f 100644
--- a/src/sbt-test/windows/test-custom-main/build.sbt
+++ b/src/sbt-test/windows/test-custom-main/build.sbt
@@ -6,7 +6,7 @@ name := "test-custom-main"
 
 version := "0.1.0"
 
-(Compile / mainClass) := Some("Main")
+Compile / mainClass := Some("Main")
 
 TaskKey[Unit]("checkAppMain") := {
   val zipFile = (Universal / packageBin).value
diff --git a/src/sphinx/formats/jdkpackager.rst b/src/sphinx/formats/jdkpackager.rst
index bd8b0a8d8..d6e8a113c 100644
--- a/src/sphinx/formats/jdkpackager.rst
+++ b/src/sphinx/formats/jdkpackager.rst
@@ -191,7 +191,7 @@ Here's what the build file looks like:
     )
 
     // Example of specifying a fallback location of `ant-javafx.jar` if plugin can't find it.
-    (JDKPackager / antPackagerTasks) := (JDKPackager / antPackagerTasks).value orElse {
+    JDKPackager / antPackagerTasks := (JDKPackager / antPackagerTasks).value orElse {
       for {
         f <- Some(file("/usr/lib/jvm/java-8-oracle/lib/ant-javafx.jar")) if f.exists()
       } yield f
diff --git a/src/sphinx/formats/universal.rst b/src/sphinx/formats/universal.rst
index 5c47f474e..9cd009304 100644
--- a/src/sphinx/formats/universal.rst
+++ b/src/sphinx/formats/universal.rst
@@ -391,7 +391,7 @@ If you want to add everything in a directory where the path for the directory is
 
 .. code-block:: scala
 
-    (Universal / mappings) ~= (_ ++ directory(target.value / "scala-2.10" / "api"))
+    Universal / mappings ~= (_ ++ directory(target.value / "scala-2.10" / "api"))