diff --git a/README.md b/README.md
index e67bc49..64ea1ef 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ the dropwizard environment upon service start.
         <dependency>
             <groupId>com.hubspot.dropwizard</groupId>
             <artifactId>dropwizard-guice</artifactId>
-            <version>0.8.4.0</version>
+            <version>${current.version}</version>
         </dependency>
     </dependencies>
 ```
@@ -157,7 +157,7 @@ public void initialize(Bootstrap<HelloWorldConfiguration> bootstrap) {
 As of Dropwizard 0.8.x, when writing Integration Tests using `DropwizardAppRule`, you need to reset
 [jersey2-guice](https://github.com/Squarespace/jersey2-guice) by running:
 
-    BootstrapUtils.reset();
+    JerseyGuiceUtils.reset();
 
 ## Examples
 Please fork [an example project](https://github.com/eliast/dropwizard-guice-example) if you'd like to get going right away. 
diff --git a/pom.xml b/pom.xml
index 58e52c8..311e353 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>com.hubspot</groupId>
         <artifactId>basepom</artifactId>
-        <version>12.7</version>
+        <version>15.6</version>
     </parent>
 
     <groupId>com.hubspot.dropwizard</groupId>
     <artifactId>dropwizard-guice</artifactId>
-    <version>0.8.4.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <description>Simple library for using Guice DI in a dropwizard service.</description>
     <url>https://github.com/HubSpot/dropwizard-guice</url>
 
@@ -30,59 +30,48 @@
     </developers>
 
     <properties>
-        <dropwizard.version>0.8.4</dropwizard.version>
-        <dep.guava.version>18.0</dep.guava.version>
-        <dep.jetty.version>9.2.9.v20150224</dep.jetty.version>
+        <dropwizard.version>1.0.0</dropwizard.version>
+        <dep.guava.version>19.0</dep.guava.version>
+        <dep.jetty.version>9.3.11.v20160721</dep.jetty.version>
         <hibernate.version>5.1.3.Final</hibernate.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-healthchecks</artifactId>
-                <version>3.1.2</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.dropwizard</groupId>
+                <artifactId>dropwizard-bom</artifactId>
+                <version>${dropwizard.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-server</artifactId>
-                <version>2.21</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.glassfish.hk2.external</groupId>
-                        <artifactId>javax.inject</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <scope>test</scope>
+                <version>2.0.54-beta</version><!--match expectation by artifact: io.dropwizard:dropwizard-testing-->
+            </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <scope>test</scope>
+                <version>3.4.1</version><!--match expectation by artifact io.dropwizard:dropwizard-testing-->
             </dependency>
             <dependency>
                 <groupId>com.squarespace.jersey2-guice</groupId>
-                <artifactId>jersey2-guice</artifactId>
-                <version>0.10</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.google.code.findbugs</groupId>
-                        <artifactId>jsr305</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.glassfish.jersey.containers</groupId>
-                        <artifactId>jersey-container-servlet-core</artifactId>
-                    </exclusion>
-                </exclusions>
+                <artifactId>jersey2-guice-impl</artifactId>
+                <version>1.0.6</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.hk2</groupId>
                 <artifactId>hk2-api</artifactId>
-                <version>2.4.0-b31</version>
+                <version>2.4.0-b34</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.glassfish.hk2.external</groupId>
+                        <artifactId>aopalliance-repackaged</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>javax.ws.rs</groupId>
@@ -92,7 +81,7 @@
             <dependency>
                 <groupId>org.reflections</groupId>
                 <artifactId>reflections</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.10</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.google.guava</groupId>
@@ -100,10 +89,15 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.javassist</groupId>
+                <artifactId>javassist</artifactId>
+                <version>3.19.0-GA</version><!--match expectation from artifact: org.reflections:reflections-->
+            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.1</version>
+                <version>4.5.2</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -114,7 +108,13 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.3</version>
+                <version>4.4.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.objenesis</groupId>
+                <artifactId>objenesis</artifactId>
+                <version>2.3</version><!--match expectation from artifact: io.dropwizard:dropwizard-testing-->
+                <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -148,6 +148,10 @@
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-servlets</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-healthchecks</artifactId>
@@ -155,12 +159,6 @@
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>aopalliance</groupId>
-                    <artifactId>aopalliance</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.inject.extensions</groupId>
@@ -172,7 +170,7 @@
         </dependency>
         <dependency>
             <groupId>com.squarespace.jersey2-guice</groupId>
-            <artifactId>jersey2-guice</artifactId>
+            <artifactId>jersey2-guice-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>
diff --git a/src/main/java/com/hubspot/dropwizard/guice/GuiceBundle.java b/src/main/java/com/hubspot/dropwizard/guice/GuiceBundle.java
index fe1c1dd..76085e2 100644
--- a/src/main/java/com/hubspot/dropwizard/guice/GuiceBundle.java
+++ b/src/main/java/com/hubspot/dropwizard/guice/GuiceBundle.java
@@ -7,16 +7,20 @@
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.Stage;
+import com.google.inject.servlet.ServletModule;
+import com.squarespace.jersey2.guice.JerseyGuiceModule;
+import com.squarespace.jersey2.guice.JerseyGuiceUtils;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.dropwizard.Configuration;
 import io.dropwizard.ConfiguredBundle;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
+import java.util.List;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.hk2.extension.ServiceLocatorGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-
 public class GuiceBundle<T extends Configuration> implements ConfiguredBundle<T> {
 
     final Logger logger = LoggerFactory.getLogger(GuiceBundle.class);
@@ -24,7 +28,7 @@ public class GuiceBundle<T extends Configuration> implements ConfiguredBundle<T>
     private final AutoConfig autoConfig;
     private final List<Module> modules;
     private final InjectorFactory injectorFactory;
-    private Injector injector;
+    private Injector baseInjector;
     private DropwizardEnvironmentModule dropwizardEnvironmentModule;
     private Optional<Class<T>> configurationClass;
     private Stage stage;
@@ -91,20 +95,31 @@ public void initialize(Bootstrap<?> bootstrap) {
         } else {
             dropwizardEnvironmentModule = new DropwizardEnvironmentModule<>(Configuration.class);
         }
-        modules.add(new JerseyModule());
         modules.add(dropwizardEnvironmentModule);
+        modules.add(new ServletModule());
 
         initInjector();
+        JerseyGuiceUtils.install(new ServiceLocatorGenerator() {
+            @Override
+            public ServiceLocator create(String name, ServiceLocator parent) {
+                if (!name.startsWith("__HK2_Generated_")) {
+                    return null;
+                }
+
+                return baseInjector.createChildInjector(new JerseyGuiceModule(name))
+                        .getInstance(ServiceLocator.class);
+            }
+        });
 
         if (autoConfig != null) {
-            autoConfig.initialize(bootstrap, injector);
+            autoConfig.initialize(bootstrap, baseInjector.createChildInjector(new JerseyGuiceModule(JerseyGuiceUtils.newServiceLocator())));
         }
     }
 
     @SuppressFBWarnings("DM_EXIT")
     private void initInjector() {
         try {
-            injector = injectorFactory.create(this.stage,ImmutableList.copyOf(this.modules));
+            baseInjector = injectorFactory.create(this.stage,ImmutableList.copyOf(this.modules));
         } catch(Exception ie) {
             logger.error("Exception occurred when creating Guice Injector - exiting", ie);
             System.exit(1);
@@ -113,12 +128,12 @@ private void initInjector() {
 
     @Override
     public void run(final T configuration, final Environment environment) {
-        JerseyUtil.registerGuiceBound(injector, environment.jersey());
+        JerseyUtil.registerGuiceBound(baseInjector, environment.jersey());
         JerseyUtil.registerGuiceFilter(environment);
         setEnvironment(configuration, environment);
 
         if (autoConfig != null) {
-            autoConfig.run(environment, injector);
+            autoConfig.run(environment, baseInjector);
         }
     }
 
@@ -128,6 +143,7 @@ private void setEnvironment(final T configuration, final Environment environment
     }
 
     public Injector getInjector() {
-        return injector;
+        Preconditions.checkState(baseInjector != null, "injector is only available after com.hubspot.dropwizard.guice.GuiceBundle.initialize() is called");
+        return baseInjector.createChildInjector(new JerseyGuiceModule(JerseyGuiceUtils.newServiceLocator()));
     }
 }
diff --git a/src/main/java/com/hubspot/dropwizard/guice/HK2Linker.java b/src/main/java/com/hubspot/dropwizard/guice/HK2Linker.java
deleted file mode 100644
index 8873ae2..0000000
--- a/src/main/java/com/hubspot/dropwizard/guice/HK2Linker.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.hubspot.dropwizard.guice;
-
-import com.google.inject.Injector;
-import com.squarespace.jersey2.guice.BootstrapUtils;
-import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
-
-//Inspired by gwizard-jersey - https://github.com/stickfigure/gwizard
-/**
- * Binding this as an eager singleton provides the second step of linking Guice back into HK2.
- * (the first step was to install the HK2 BootstrapModule in the Guice module).
- *
- * This needs to happen before anything else related to Jersey starts.
- */
-public class HK2Linker {
-    @Inject
-    public HK2Linker(Injector injector, ServiceLocator locator) {
-        BootstrapUtils.link(locator, injector);
-        BootstrapUtils.install(locator);
-    }
-
-}
diff --git a/src/main/java/com/hubspot/dropwizard/guice/JerseyModule.java b/src/main/java/com/hubspot/dropwizard/guice/JerseyModule.java
deleted file mode 100644
index 445c47b..0000000
--- a/src/main/java/com/hubspot/dropwizard/guice/JerseyModule.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hubspot.dropwizard.guice;
-
-import com.google.inject.servlet.ServletModule;
-import com.squarespace.jersey2.guice.BootstrapModule;
-import com.squarespace.jersey2.guice.BootstrapUtils;
-import org.glassfish.hk2.api.ServiceLocator;
-
-//Inspired by gwizard-jersey - https://github.com/stickfigure/gwizard
-public class JerseyModule extends ServletModule {
-
-    @Override
-    protected void configureServlets() {
-        // The order these operations (including the steps in the linker) are important
-        ServiceLocator locator = new ServiceLocatorDecorator(BootstrapUtils.newServiceLocator()) {
-
-            @Override
-            public void shutdown() {
-                // don't shutdown, see issue #67. Remove once jersey2-guice supports Jersey 2.21
-            }
-        };
-        install(new BootstrapModule(locator));
-
-        bind(HK2Linker.class).asEagerSingleton();
-    }
-}
diff --git a/src/test/java/com/hubspot/dropwizard/guice/AutoConfigTest.java b/src/test/java/com/hubspot/dropwizard/guice/AutoConfigTest.java
index 1bb6656..43eae59 100644
--- a/src/test/java/com/hubspot/dropwizard/guice/AutoConfigTest.java
+++ b/src/test/java/com/hubspot/dropwizard/guice/AutoConfigTest.java
@@ -1,5 +1,6 @@
 package com.hubspot.dropwizard.guice;
 
+import com.codahale.metrics.MetricRegistry;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.hubspot.dropwizard.guice.objects.*;
@@ -29,7 +30,7 @@ public class AutoConfigTest {
     private final Injector injector = Guice.createInjector(new TestModule());
 
     @Spy
-    private Environment environment = new Environment("test env", Jackson.newObjectMapper(), null, null, null);
+    private Environment environment = new Environment("test env", Jackson.newObjectMapper(), null, new MetricRegistry(), null);
     private AutoConfig autoConfig;
 
     @Before
diff --git a/src/test/java/com/hubspot/dropwizard/guice/GuiceBundleTest.java b/src/test/java/com/hubspot/dropwizard/guice/GuiceBundleTest.java
index 0037b82..3d25713 100644
--- a/src/test/java/com/hubspot/dropwizard/guice/GuiceBundleTest.java
+++ b/src/test/java/com/hubspot/dropwizard/guice/GuiceBundleTest.java
@@ -1,8 +1,9 @@
 package com.hubspot.dropwizard.guice;
 
+import com.codahale.metrics.MetricRegistry;
 import com.google.inject.Injector;
 import com.hubspot.dropwizard.guice.objects.TestModule;
-import com.squarespace.jersey2.guice.BootstrapUtils;
+import com.squarespace.jersey2.guice.JerseyGuiceUtils;
 import io.dropwizard.Configuration;
 import io.dropwizard.jackson.Jackson;
 import io.dropwizard.setup.Bootstrap;
@@ -30,13 +31,13 @@ public class GuiceBundleTest {
 
     @After
     public void tearDown() {
-        BootstrapUtils.reset();
+        JerseyGuiceUtils.reset();
     }
 
     @Before
     public void setUp() {
         //given
-        environment = new Environment("test env", Jackson.newObjectMapper(), null, null, null);
+        environment = new Environment("test env", Jackson.newObjectMapper(), null, new MetricRegistry(), null);
         guiceBundle = GuiceBundle.newBuilder()
                 .addModule(new TestModule())
                 .build();
diff --git a/src/test/java/com/hubspot/dropwizard/guice/HK2LinkerTest.java b/src/test/java/com/hubspot/dropwizard/guice/HK2LinkerTest.java
index d86f87c..973c983 100644
--- a/src/test/java/com/hubspot/dropwizard/guice/HK2LinkerTest.java
+++ b/src/test/java/com/hubspot/dropwizard/guice/HK2LinkerTest.java
@@ -1,13 +1,17 @@
 package com.hubspot.dropwizard.guice;
 
-import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.hubspot.dropwizard.guice.objects.ExplicitResource;
 import com.hubspot.dropwizard.guice.objects.JitResource;
 import com.hubspot.dropwizard.guice.objects.TestModule;
-import com.squarespace.jersey2.guice.BootstrapUtils;
+import com.squarespace.jersey2.guice.JerseyGuiceUtils;
+import io.dropwizard.Application;
+import io.dropwizard.Configuration;
+import io.dropwizard.setup.Bootstrap;
+import io.dropwizard.setup.Environment;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import javax.servlet.ServletException;
@@ -16,12 +20,26 @@
 
 public class HK2LinkerTest {
 
-    final Injector injector = Guice.createInjector(new JerseyModule(), new TestModule());
+    private static Injector injector;
     final ServiceLocator serviceLocator = injector.getInstance(ServiceLocator.class);
 
+    @BeforeClass
+    public static void setup() {
+
+        final GuiceBundle bundle = new GuiceBundle.Builder().addModule(new TestModule()).build();
+        bundle.initialize(new Bootstrap<Configuration>(new Application<Configuration>() {
+            @Override
+            public void run(Configuration configuration, Environment environment) throws Exception {
+
+            }
+        }));
+        injector = bundle.getInjector();
+
+    }
+
     @AfterClass
     public static void tearDown() {
-        BootstrapUtils.reset();
+        JerseyGuiceUtils.reset();
     }
 
     @Test
diff --git a/src/test/java/com/hubspot/dropwizard/guice/InjectedIntegrationTest.java b/src/test/java/com/hubspot/dropwizard/guice/InjectedIntegrationTest.java
index 77806e8..5c7c7fb 100644
--- a/src/test/java/com/hubspot/dropwizard/guice/InjectedIntegrationTest.java
+++ b/src/test/java/com/hubspot/dropwizard/guice/InjectedIntegrationTest.java
@@ -3,7 +3,7 @@
 import com.google.common.io.Resources;
 import com.hubspot.dropwizard.guice.objects.InjectedBundle;
 import com.hubspot.dropwizard.guice.objects.TestApplication;
-import com.squarespace.jersey2.guice.BootstrapUtils;
+import com.squarespace.jersey2.guice.JerseyGuiceUtils;
 import io.dropwizard.Configuration;
 import io.dropwizard.client.JerseyClientBuilder;
 import io.dropwizard.testing.junit.DropwizardAppRule;
@@ -32,7 +32,7 @@ public static void setUp() {
 
     @AfterClass
     public static void tearDown() {
-        BootstrapUtils.reset();
+        JerseyGuiceUtils.reset();
     }
 
     public static String resourceFilePath(String resourceClassPathLocation) {