diff --git a/test/packages/multiinput/_dev/deploy/docker/Dockerfile b/test/packages/multiinput/_dev/deploy/docker/Dockerfile
deleted file mode 100644
index b52af4192..000000000
--- a/test/packages/multiinput/_dev/deploy/docker/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM golang:1.15 as builder
-
-ADD . /app
-
-WORKDIR /app
-
-RUN go mod download
-
-ENV CGO_ENABLED=0
-RUN go build
-
-# ------------------------------------------------------------------------------
-FROM scratch
-
-COPY --chown=0:0 --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-COPY --chown=0:0 --from=builder /app/stream /stream
-
-CMD ["/stream"] 
diff --git a/test/packages/multiinput/_dev/deploy/docker/docker-compose.yml b/test/packages/multiinput/_dev/deploy/docker/docker-compose.yml
index d7389f444..85ff94ee5 100644
--- a/test/packages/multiinput/_dev/deploy/docker/docker-compose.yml
+++ b/test/packages/multiinput/_dev/deploy/docker/docker-compose.yml
@@ -1,14 +1,12 @@
 version: '2.3'
 services:
   test-tcp:
-    tty: true
-    build: .
+    image: akroh/stream:v0.0.1
     volumes:
-      - ./logs:/logs/:ro
-    command: /stream -proto tcp -dest elastic-agent:9999 /logs/generated.log
+      - ./logs:/logs:ro
+    command: log --start-signal=SIGHUP --delay=5s --addr elastic-agent:9999 -p=tcp /logs/generated.log
   test-udp:
-    tty: true
-    build: .
+    image: akroh/stream:v0.0.1
     volumes:
-      - ./logs:/logs/:ro
-    command: /stream -proto udp -delay 100ms -dest elastic-agent:9999 /logs/generated.log
+      - ./logs:/logs:ro
+    command: log --start-signal=SIGHUP --delay=5s --addr elastic-agent:9999 -p=udp /logs/generated.log
diff --git a/test/packages/multiinput/_dev/deploy/docker/go.mod b/test/packages/multiinput/_dev/deploy/docker/go.mod
deleted file mode 100644
index c3ede82b6..000000000
--- a/test/packages/multiinput/_dev/deploy/docker/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module github.com/elastic/elastic-package/packages/multiinput/_dev/deploy/docker/stream
-
-go 1.15
diff --git a/test/packages/multiinput/_dev/deploy/docker/main.go b/test/packages/multiinput/_dev/deploy/docker/main.go
deleted file mode 100644
index 39b7760fd..000000000
--- a/test/packages/multiinput/_dev/deploy/docker/main.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-// or more contributor license agreements. Licensed under the Elastic License;
-// you may not use this file except in compliance with the Elastic License.
-
-// +build darwin linux
-
-package main
-
-import (
-	"bufio"
-	"errors"
-	"flag"
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
-)
-
-var (
-	dest       string
-	proto      string
-	delay      time.Duration
-	waitSIGHUP bool
-)
-
-func init() {
-	flag.StringVar(&dest, "dest", "localhost:514", "destination tcp address")
-	flag.StringVar(&proto, "proto", "tcp", "protocol to use (tcp or udp)")
-	flag.DurationVar(&delay, "delay", 0, "delay between messages")
-	flag.BoolVar(&waitSIGHUP, "wait-sighup", false, "wait for SIGHUP before streaming")
-}
-
-func main() {
-	log.SetFlags(0)
-	flag.Parse()
-
-	if waitSIGHUP {
-		start := make(chan os.Signal, 1)
-		signal.Notify(start, syscall.SIGHUP)
-		log.Println("Waiting for SIGHUP before streaming...")
-		<-start
-	}
-
-	var err error
-	fmt.Fprintf(os.Stderr, "Using proto=%s dest=%s\n", proto, dest)
-	var conn net.Conn
-	for {
-		conn, err = net.Dial(proto, dest)
-		if err != nil {
-			log.Println(err)
-			time.Sleep(time.Second)
-			continue
-		}
-		break
-	}
-	defer conn.Close()
-
-	for _, input := range flag.Args() {
-		fmt.Fprintf(os.Stderr, "Delivering file %v\n", input)
-		f, err := os.Open(input)
-		if err != nil {
-			log.Fatal(err)
-		}
-		defer f.Close()
-
-		scanner := bufio.NewScanner(f)
-		count := 0
-
-		for scanner.Scan() {
-			count += 1
-			time.Sleep(delay)
-			data := append(scanner.Bytes(), '\n')
-			n, err := conn.Write(data)
-			if err != nil || n != len(data) {
-				if proto == "udp" && errors.Is(err, syscall.ECONNREFUSED) {
-					time.Sleep(time.Second)
-					log.Printf("Restarted count=%d", count)
-					f.Seek(0, 0)
-					scanner = bufio.NewScanner(f)
-					count = 0
-					continue
-				}
-				log.Fatalf("Error sending message %d: %v", count, err)
-			}
-		}
-	}
-}
diff --git a/test/packages/multiinput/data_stream/test/_dev/test/system/test-tcp-config.yml b/test/packages/multiinput/data_stream/test/_dev/test/system/test-tcp-config.yml
index 10fb7aa19..6cf9940b7 100644
--- a/test/packages/multiinput/data_stream/test/_dev/test/system/test-tcp-config.yml
+++ b/test/packages/multiinput/data_stream/test/_dev/test/system/test-tcp-config.yml
@@ -1,5 +1,6 @@
 input: tcp
 service: test-tcp
+service_notify_signal: SIGHUP
 vars: ~
 data_stream:
   vars: