diff --git a/agent-operator/Dockerfile b/docker-images/agent-operator/oss/Dockerfile
similarity index 100%
rename from agent-operator/Dockerfile
rename to docker-images/agent-operator/oss/Dockerfile
diff --git a/docker-images/agent-operator/pom.xml b/docker-images/agent-operator/pom.xml
new file mode 100644
index 0000000000..4a23b8f99b
--- /dev/null
+++ b/docker-images/agent-operator/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.walmartlabs.concord.docker</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.11.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>concord-agent-operator</artifactId>
+    <packaging>pom</packaging>
+
+    <properties>
+        <agent.image>${docker.namespace}/concord-agent-operator</agent.image>
+        <docker.tagbase>${agent.image}</docker.tagbase>
+        <docker.file>oss/Dockerfile</docker.file>
+        <docker.allowPull>false</docker.allowPull>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.walmartlabs.concord.k8s</groupId>
+            <artifactId>concord-agent-operator</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dist</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.walmartlabs.concord.k8s</groupId>
+                                    <artifactId>concord-agent-operator</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <classifier>uber</classifier>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <destFileName>operator.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>docker-build</id>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/docker-images/pom.xml b/docker-images/pom.xml
index 71f7fc8e23..c91b25675b 100644
--- a/docker-images/pom.xml
+++ b/docker-images/pom.xml
@@ -18,6 +18,7 @@
         <module>ansible</module>
         <module>agent</module>
         <module>server</module>
+        <module>agent-operator</module>
     </modules>
 
     <properties>