diff --git a/docker/Makefile b/docker/Makefile
index 0dcb3df..6e6ae57 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -13,5 +13,5 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-SUBDIRS = MON NBI osmclient RO LCM light-ui pm Keystone
+SUBDIRS = MON NBI osmclient RO LCM light-ui POL Keystone
 include mk/dirs.mk
diff --git a/docker/pm/Dockerfile b/docker/POL/Dockerfile
similarity index 85%
rename from docker/pm/Dockerfile
rename to docker/POL/Dockerfile
index 6409740..f5ce057 100644
--- a/docker/pm/Dockerfile
+++ b/docker/POL/Dockerfile
@@ -47,4 +47,16 @@
 
 RUN apt-get --yes update  && apt-get -y install python3-osm-policy-module${POL_VERSION}
 
-#CMD bash /MON/policy_module/scripts/gen_config_from_env.sh && osm-policy-agent --config osm_policy_agent.cfg
+ENV OSMPOL_MESSAGE_DRIVER kafka
+ENV OSMPOL_MESSAGE_HOST kafka
+ENV OSMPOL_MESSAGE_PORT 9092
+
+ENV OSMPOL_DATABASE_DRIVER mongo
+ENV OSMPOL_DATABASE_HOST mongo
+ENV OSMPOL_DATABASE_PORT 27017
+
+ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db
+
+ENV OSMPOL_LOG_LEVEL INFO
+
+CMD osm-policy-agent
diff --git a/docker/pm/Makefile b/docker/POL/Makefile
similarity index 100%
rename from docker/pm/Makefile
rename to docker/POL/Makefile