diff --git a/google-cloud-nio/EnableAutoValue.txt b/google-cloud-nio/EnableAutoValue.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml
index 94b47dbf..8cc3169c 100644
--- a/google-cloud-nio/pom.xml
+++ b/google-cloud-nio/pom.xml
@@ -42,26 +42,14 @@
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.service</groupId>
-      <artifactId>auto-service</artifactId>
-      <version>1.0-rc3</version>
-      <optional>true</optional>
-      <scope>provided</scope> <!-- to leave out of the all-deps jar -->
-    </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <scope>provided</scope> <!-- to leave out of the all-deps jar -->
+      <artifactId>auto-value-annotations</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value-annotations</artifactId>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
@@ -86,7 +74,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.7.0</version>
+      <version>2.28.2</version>
       <scope>test</scope>
     </dependency><dependency>
       <groupId>org.hamcrest</groupId>
@@ -95,6 +83,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -104,16 +93,6 @@
           <skip>false</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <encoding>UTF-8</encoding>
-          <compilerArgument>-Xlint:unchecked</compilerArgument>
-        </configuration>
-      </plugin>
       <!-- shade the jar so we can demo adding the NIO jar to add functionality. -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -173,17 +152,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <ignoredUnusedDeclaredDependencies>
-            <ignoredUnusedDeclaredDependency>com.google.auto.value:auto-value</ignoredUnusedDeclaredDependency>
-            <ignoredUnusedDeclaredDependency>com.google.auto.service:auto-service</ignoredUnusedDeclaredDependency>
-          </ignoredUnusedDeclaredDependencies>
-        </configuration>
-      </plugin>
-      
     </plugins>
   </build>
 </project>
diff --git a/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
index 7d5e9c97..4f2953b3 100644
--- a/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
+++ b/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
@@ -21,7 +21,6 @@
 import static com.google.common.base.Strings.isNullOrEmpty;
 
 import com.google.api.gax.paging.Page;
-import com.google.auto.service.AutoService;
 import com.google.cloud.storage.Acl;
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.BlobId;
@@ -86,7 +85,6 @@
  */
 @Singleton
 @ThreadSafe
-@AutoService(FileSystemProvider.class)
 public final class CloudStorageFileSystemProvider extends FileSystemProvider {
 
   private Storage storage;
diff --git a/google-cloud-nio/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider b/google-cloud-nio/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider
new file mode 100644
index 00000000..cdacea41
--- /dev/null
+++ b/google-cloud-nio/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider
@@ -0,0 +1,14 @@
+# Copyright 2021 Google LLC
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+com.google.cloud.storage.contrib.nio.CloudStorageFileSystemProvider
diff --git a/pom.xml b/pom.xml
index bf32751a..470993a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,16 +96,10 @@
       </dependency>
       <dependency>
         <groupId>com.google.auto.value</groupId>
-        <artifactId>auto-value</artifactId>
-        <scope>provided</scope> <!-- to leave out of the all-deps jar -->
-        <version>${auto-value-annotation.version}</version>
-      </dependency>
-      <dependency>
-       <groupId>com.google.auto.value</groupId>
         <artifactId>auto-value-annotations</artifactId>
+        <scope>provided</scope> <!-- to leave out of the all-deps jar -->
         <version>${auto-value-annotation.version}</version>
       </dependency>
-
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -120,21 +114,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <configuration>
-            <ignoredUnusedDeclaredDependencies>
-              <ignoredDependency>com.google.auto.value:auto-value-annotations</ignoredDependency>
-            </ignoredUnusedDeclaredDependencies>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+
   <modules>
     <module>google-cloud-nio</module>
     <module>google-cloud-nio-retrofit</module>
@@ -207,18 +187,6 @@
           </links>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>com.google.auto.value</groupId>
-              <artifactId>auto-value</artifactId>
-              <version>${auto-value.version}</version>
-            </path>
-          </annotationProcessorPaths>
-        </configuration>
-      </plugin>
     </plugins>
   </reporting>