diff --git a/build.sbt b/build.sbt
index 486c76f224a..dcb396c7b8a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -27,7 +27,7 @@ crossScalaVersions := Nil
 
 lazy val commonSettings = Seq(
   organization := "io.delta",
-  scalaVersion := "2.12.14",
+  scalaVersion := scala212,
   crossScalaVersions := Seq(scala212, scala213),
   fork := true
 )
@@ -298,7 +298,10 @@ import ReleaseTransformations._
 
 lazy val releaseSettings = Seq(
   publishMavenStyle := true,
-
+  publishArtifact := true,
+  Test / publishArtifact := false,
+  releasePublishArtifactsAction := PgpKeys.publishSigned.value,
+  releaseCrossBuild := true,
   publishTo := {
     val nexus = "https://oss.sonatype.org/"
     if (isSnapshot.value) {
@@ -307,25 +310,7 @@ lazy val releaseSettings = Seq(
       Some("releases"  at nexus + "service/local/staging/deploy/maven2")
     }
   },
-
-  releasePublishArtifactsAction := PgpKeys.publishSigned.value,
-
-  releaseCrossBuild := true,
-
-  releaseProcess := Seq[ReleaseStep](
-    checkSnapshotDependencies,
-    inquireVersions,
-    runTest,
-    setReleaseVersion,
-    commitReleaseVersion,
-    tagRelease,
-    releaseStepCommandAndRemaining("+publishLocalSigned"),
-    setNextVersion,
-    commitNextVersion
-  ),
-
   licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")),
-
   pomExtra :=
     <url>https://delta.io/</url>
       <scm>
@@ -373,6 +358,17 @@ lazy val releaseSettings = Seq(
 
 // Looks like some of release settings should be set for the root project as well.
 publishArtifact := false  // Don't release the root project
-publish := {}
+publish / skip := true
 publishTo := Some("snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
-releaseCrossBuild := false
+releaseCrossBuild := false  // Don't use sbt-release's cross facility
+releaseProcess := Seq[ReleaseStep](
+  checkSnapshotDependencies,
+  inquireVersions,
+  runTest,
+  setReleaseVersion,
+  commitReleaseVersion,
+  tagRelease,
+  releaseStepCommandAndRemaining("+publishSigned"),
+  setNextVersion,
+  commitNextVersion
+)
diff --git a/run-integration-tests.py b/run-integration-tests.py
index 8843edf7478..b5690505b14 100755
--- a/run-integration-tests.py
+++ b/run-integration-tests.py
@@ -128,6 +128,7 @@ def run_pip_installation_tests(root_dir, version, use_testpypi, extra_maven_repo
 def clear_artifact_cache():
     print("Clearing Delta artifacts from ivy2 and mvn cache")
     delete_if_exists(os.path.expanduser("~/.ivy2/cache/io.delta"))
+    delete_if_exists(os.path.expanduser("~/.ivy2/local/io.delta"))
     delete_if_exists(os.path.expanduser("~/.m2/repository/io/delta/"))