diff --git a/ros2/nightly/Makefile b/ros2/nightly/Makefile
index f61a60106..eb4c68884 100644
--- a/ros2/nightly/Makefile
+++ b/ros2/nightly/Makefile
@@ -19,6 +19,11 @@ pull:
 	@docker pull osrf/ros2:nightly-rmw
 	@docker pull osrf/ros2:nightly-rmw-nonfree
 
+push:
+	@docker push osrf/ros2:nightly
+	@docker push osrf/ros2:nightly-rmw
+	@docker push osrf/ros2:nightly-rmw-nonfree
+
 clean:
 	@docker rmi -f osrf/ros2:nightly
 	@docker rmi -f osrf/ros2:nightly-rmw
diff --git a/ros2/nightly/nightly-rmw-nonfree/Dockerfile b/ros2/nightly/nightly-rmw-nonfree/Dockerfile
index 80f25845a..64ee72d64 100644
--- a/ros2/nightly/nightly-rmw-nonfree/Dockerfile
+++ b/ros2/nightly/nightly-rmw-nonfree/Dockerfile
@@ -2,13 +2,12 @@ FROM osrf/ros2:nightly-rmw
 
 # install dependencies
 ENV RTI_NC_LICENSE_ACCEPTED=yes
-RUN . /opt/ros/$ROS_DISTRO/setup.sh \
-    && apt-get update \
-    && rosdep install -y \
-    --from-paths /opt/ros/$ROS_DISTRO/share \
-    --ignore-src \
-    --skip-keys " \
-      " \
+RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
+    apt-get update && rosdep install -y \
+      --from-paths /opt/ros/$ROS_DISTRO/share \
+      --ignore-src \
+      --skip-keys " \
+        " \
     && rm -rf /var/lib/apt/lists/*
 
 # setup RTI Connext DDS
diff --git a/ros2/nightly/nightly-rmw/Dockerfile b/ros2/nightly/nightly-rmw/Dockerfile
index e44daa3a5..b643397e3 100644
--- a/ros2/nightly/nightly-rmw/Dockerfile
+++ b/ros2/nightly/nightly-rmw/Dockerfile
@@ -1,11 +1,10 @@
 FROM osrf/ros2:nightly
 
 # install dependencies
-RUN . /opt/ros/$ROS_DISTRO/setup.sh \
-    && apt-get update \
-    && rosdep install -y \
-    --from-paths /opt/ros/$ROS_DISTRO/share \
-    --ignore-src \
-    --skip-keys " \
-      rti-connext-dds-5.3.1" \
+RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
+    apt-get update && rosdep install -y \
+      --from-paths /opt/ros/$ROS_DISTRO/share \
+      --ignore-src \
+      --skip-keys " \
+        rti-connext-dds-5.3.1" \
     && rm -rf /var/lib/apt/lists/*
diff --git a/ros2/nightly/nightly/Dockerfile b/ros2/nightly/nightly/Dockerfile
index 4d0f8fe73..70f1ae90a 100644
--- a/ros2/nightly/nightly/Dockerfile
+++ b/ros2/nightly/nightly/Dockerfile
@@ -87,20 +87,15 @@ RUN colcon mixin add default \
     colcon metadata update
 
 # install dependencies
-RUN . /opt/ros/$ROS_DISTRO/setup.sh \
-    && apt-get update \
-    && rosdep install -y \
-    --from-paths /opt/ros/$ROS_DISTRO/share \
-    --ignore-src \
-    --skip-keys " \
-      libopensplice69 \
-      rti-connext-dds-5.3.1" \
+RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
+    apt-get update && rosdep install -y \
+      --from-paths /opt/ros/$ROS_DISTRO/share \
+      --ignore-src \
+      --skip-keys " \
+        libopensplice69 \
+        rti-connext-dds-5.3.1" \
     && rm -rf /var/lib/apt/lists/*
 
-# FIXME Remove this once rosdep detects ROS 2 packages https://github.com/ros-infrastructure/rosdep/issues/660
-# ignore installed rosdep keys
-ENV ROS_PACKAGE_PATH /opt/ros/$ROS_DISTRO/share
-
 # FIXME Remove this once ament_export_interfaces respects COLCON_CURRENT_PREFIX https://github.com/ament/ament_cmake/issues/173
 #Workaround hard coded paths in nightly tarball setup scripts
 ARG UPSTREAM_CI_WS=/home/jenkins-agent/workspace/packaging_linux/ws