diff --git a/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/SmokeTest.groovy b/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/SmokeTest.groovy
index bcf119c93..37fd4762d 100644
--- a/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/SmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/SmokeTest.groovy
@@ -42,7 +42,7 @@ abstract class SmokeTest extends Specification {
   private Backend backend = Backend.getInstance()
 
   @Shared
-//  protected String agentPath = "/Users/ploffay/projects/hypertrace/javaagent/javaagent/build/libs/hypertrace-agent-0.11.2-SNAPSHOT-all.jar"// System.getProperty("smoketest.javaagent.path")
+//  protected String agentPath = "/Users/ploffay/projects/hypertrace/javaagent/javaagent/build/libs/hypertrace-agent-1.0.1-SNAPSHOT-all.jar"
   protected String agentPath =  System.getProperty("smoketest.javaagent.path")
 
   @Shared
diff --git a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/AbstractSmokeTest.java b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/AbstractSmokeTest.java
index 470204f00..7c2486197 100644
--- a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/AbstractSmokeTest.java
+++ b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/AbstractSmokeTest.java
@@ -40,6 +40,8 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.PullPolicy;
 import org.testcontainers.shaded.com.fasterxml.jackson.core.JsonProcessingException;
 import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
 import org.testcontainers.utility.DockerImageName;
@@ -47,11 +49,11 @@
 
 public abstract class AbstractSmokeTest {
   private static final Logger log = LoggerFactory.getLogger(OpenTelemetryStorage.class);
-  private static final String OTEL_COLLECTOR_IMAGE = "otel/opentelemetry-collector:latest";
+  private static final String OTEL_COLLECTOR_IMAGE = "otel/opentelemetry-collector:0.21.0";
   private static final String MOCK_BACKEND_IMAGE =
       "ghcr.io/open-telemetry/java-test-containers:smoke-fake-backend-20201128.1734635";
   private static final String NETWORK_ALIAS_OTEL_COLLECTOR = "collector";
-  private static final String NETWORK_ALIAS_OTEL_MOCK_STORAGE = "storage";
+  private static final String NETWORK_ALIAS_OTEL_MOCK_STORAGE = "backend";
   private static final String OTEL_EXPORTER_ENDPOINT =
       String.format("http://%s:9411/api/v2/spans", NETWORK_ALIAS_OTEL_COLLECTOR);
 
@@ -76,6 +78,9 @@ public abstract class AbstractSmokeTest {
   public static void beforeAll() {
     openTelemetryStorage =
         new OpenTelemetryStorage(MOCK_BACKEND_IMAGE)
+            .withImagePullPolicy(PullPolicy.alwaysPull())
+            .withExposedPorts(8080)
+            .waitingFor(Wait.forHttp("/health").forPort(8080))
             .withNetwork(network)
             .withNetworkAliases(NETWORK_ALIAS_OTEL_MOCK_STORAGE)
             .withLogConsumer(new Slf4jLogConsumer(log));
@@ -83,15 +88,14 @@ public static void beforeAll() {
 
     collector =
         new OpenTelemetryCollector(OTEL_COLLECTOR_IMAGE)
+            .withImagePullPolicy(PullPolicy.alwaysPull())
             .withNetwork(network)
             .withNetworkAliases(NETWORK_ALIAS_OTEL_COLLECTOR)
             .withLogConsumer(new Slf4jLogConsumer(log))
             .dependsOn(openTelemetryStorage)
             .withCopyFileToContainer(
-                MountableFile.forClasspathResource("/otelcol-config.yaml"),
-                "/etc/otelcol-config.yaml")
-            .withLogConsumer(new Slf4jLogConsumer(log))
-            .withCommand("--config /etc/otelcol-config.yaml");
+                MountableFile.forClasspathResource("/otel.yaml"), "/etc/otel.yaml")
+            .withCommand("--config /etc/otel.yaml");
     collector.start();
   }
 
diff --git a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java
index 90746ddf9..d503f55b4 100644
--- a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java
+++ b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java
@@ -35,7 +35,7 @@
 //    key = "SMOKETEST_JAVAAGENT_PATH",
 //    value =
 //
-// "/Users/ploffay/projects/hypertrace/javaagent/javaagent/build/libs/hypertrace-agent-0.10.4-SNAPSHOT-all.jar")
+// "/Users/ploffay/projects/hypertrace/javaagent/javaagent/build/libs/hypertrace-agent-1.0.1-SNAPSHOT-all.jar")
 public class SpringBootSmokeTest extends AbstractSmokeTest {
 
   @Override
@@ -79,7 +79,6 @@ public void get() throws IOException, InterruptedException {
             .getMainAttributes()
             .get(Attributes.Name.IMPLEMENTATION_VERSION);
 
-    Assertions.assertEquals(1, traces.size());
     Assertions.assertEquals(
         ResourceAttributes.SERVICE_NAME.getKey(),
         traces.get(0).getResourceSpans(0).getResource().getAttributes(0).getKey());
diff --git a/smoke-tests/src/test/resources/otelcol-config.yaml b/smoke-tests/src/test/resources/otelcol-config.yaml
deleted file mode 100644
index 625999647..000000000
--- a/smoke-tests/src/test/resources/otelcol-config.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-receivers:
-  otlp:
-    protocols:
-      grpc:
-  jaeger:
-    protocols:
-      grpc:
-      thrift_http:
-  zipkin:
-
-processors:
-  batch:
-
-exporters:
-  logging:
-    loglevel: debug
-  otlp:
-    endpoint: storage:8080
-    insecure: true
-    wait_for_ready: true
-
-extensions:
-  health_check:
-
-service:
-  extensions: [health_check]
-  pipelines:
-    traces:
-      receivers: [otlp, jaeger, zipkin]
-      processors: [batch]
-      exporters: [logging, otlp]