diff --git a/CHANGELOG.md b/CHANGELOG.md
index acfb6b90f..6c30a0517 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v0.18.0
+
+* Moved to poetry for package management and dependencies
+* Restructured components to work with poetry
+* Upgraded dependencies
+* Require at least python3.8
+
 # v0.17.21
 
 * Upgrade to OVS 2.17.2
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 828f69577..5b15ff7a2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.7'
 services:
     rabbit:
         restart: always
-        image: 'iqtlabs/rabbitmq:latest'
+        image: 'iqtlabs/rabbitmq:v0.18.0'
         ports:
             - '127.0.0.1:15672:15672'
             - '5672:5672'
@@ -12,9 +12,6 @@ services:
                     - RABBIT_SERVER
                     - rabbitmq
                     - messenger
-        build:
-            context: helpers/rabbitmq
-            dockerfile: Dockerfile
     network_tap:
         restart: always
         image: 'iqtlabs/network_tap:v0.11.33'
@@ -28,7 +25,7 @@ services:
             poseidon:
     poseidon_api:
         restart: always
-        image: 'iqtlabs/poseidon-api:latest'
+        image: 'iqtlabs/poseidon-api:v0.18.0'
         ports:
             - '5000:8000'
         environment:
@@ -41,12 +38,9 @@ services:
                     - poseidon-api
         depends_on:
             - poseidon
-        build:
-            context: helpers/api
-            dockerfile: Dockerfile
     poseidon:
         restart: always
-        image: 'iqtlabs/poseidon:latest'
+        image: 'iqtlabs/poseidon:v0.18.0'
         ports:
             - '9304:9304'
         environment:
@@ -62,12 +56,9 @@ services:
                 condition: service_healthy
             rabbitmq_adapter:
                 condition: service_started
-        build:
-            context: .
-            dockerfile: Dockerfile
     workers:
         restart: always
-        image: 'iqtlabs/poseidon-workers:latest'
+        image: 'iqtlabs/poseidon-workers:v0.18.0'
         environment:
             PYTHONUNBUFFERED: '1'
             KEEPIMAGES: '0'
@@ -79,9 +70,6 @@ services:
             - '/var/run/docker.sock:/var/run/docker.sock'
         depends_on:
             - poseidon
-        build:
-            context: workers
-            dockerfile: Dockerfile
 networks:
     poseidon:
         driver: overlay
diff --git a/lib/poseidon_api/pyproject.toml b/lib/poseidon_api/pyproject.toml
index 432e3bf35..4c588b80f 100644
--- a/lib/poseidon_api/pyproject.toml
+++ b/lib/poseidon_api/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poseidon-api"
-version = "0.17.22.dev"
+version = "0.18.0"
 description = "RESTful API for querying Poseidon"
 authors = ["cglewis <clewis@iqt.org>"]
 license = "Apache-2.0"
diff --git a/lib/poseidon_cli/pyproject.toml b/lib/poseidon_cli/pyproject.toml
index d771f0be2..b1722e72a 100644
--- a/lib/poseidon_cli/pyproject.toml
+++ b/lib/poseidon_cli/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poseidon-cli"
-version = "0.17.22.dev"
+version = "0.18.0"
 description = "Commandline tool for querying Poseidon via Prometheus"
 authors = ["cglewis <clewis@iqt.org>"]
 license = "Apache-2.0"
diff --git a/lib/poseidon_core/pyproject.toml b/lib/poseidon_core/pyproject.toml
index e03cd17e9..9f1d3669b 100644
--- a/lib/poseidon_core/pyproject.toml
+++ b/lib/poseidon_core/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poseidon-core"
-version = "0.17.22.dev"
+version = "0.18.0"
 description = "Poseidon core package, an application that leverages software defined networks (SDN) to acquire and then feed network traffic to a number of analytic tools."
 authors = ["cglewis <clewis@iqt.org>"]
 license = "Apache-2.0"