diff --git a/nifi/docker-compose.yml b/nifi/docker-compose.yml
index e9c3020..5835279 100644
--- a/nifi/docker-compose.yml
+++ b/nifi/docker-compose.yml
@@ -9,8 +9,11 @@ acquisition:
   net: nifi
   environment:
     NIFI_UI_BANNER_TEXT: 'Acquisition Node'
+  # have to fix the container name until
+  # https://github.com/docker/compose/issues/2312 is addressed
+  container_name: acquisition
 
-processing:
+processing-1:
   # image: aperepel/nifi
   build: .
   ports:
@@ -18,3 +21,4 @@ processing:
   net: nifi
   environment:
     NIFI_UI_BANNER_TEXT: 'Processing Node'
+  container_name: processing-1
diff --git a/nifi/run.sh b/nifi/run.sh
index f9c9098..d6a9cd2 100644
--- a/nifi/run.sh
+++ b/nifi/run.sh
@@ -5,7 +5,7 @@ splash() {
   echo "NIFI_UI_BANNER_TEXT=$NIFI_UI_BANNER_TEXT"
 }
 
-configure() {
+configure_common() {
   sed -i 's/\.\/flowfile_repository/\/flowrepo/g' $NIFI_HOME/conf/nifi.properties
   sed -i 's/\.\/content_repository/\/contentrepo/g' $NIFI_HOME/conf/nifi.properties
   sed -i 's/\.\/conf\/flow\.xml\.gz/\/flowconf\/flow.xml.gz/' $NIFI_HOME/conf/nifi.properties
@@ -16,8 +16,17 @@ configure() {
   sed -i "s/nifi\.ui\.banner\.text=/nifi.ui.banner.text=${NIFI_UI_BANNER_TEXT}/g" $NIFI_HOME/conf/nifi.properties
 }
 
+configure_site2site() {
+  sed -i "s/nifi\.remote\.input\.socket\.host=/nifi.remote.input.socket.host=${HOSTNAME}/g" $NIFI_HOME/conf/nifi.properties
+  sed -i "s/nifi\.remote\.input\.socket\.port=/nifi.remote.input.socket.port=12345/g" $NIFI_HOME/conf/nifi.properties
+  # unsecure for now so we don't complicate the setup with certificates
+  sed -i "s/nifi\.remote\.input\.secure=true/nifi.remote.input.secure=false/g" $NIFI_HOME/conf/nifi.properties
+}
+
 splash
-configure
+configure_common
+
+configure_site2site
 
 # must be an exec so NiFi process replaces this script and receives signals
 exec ./nifi.sh run