diff --git a/datascience/src/pipeline/data/non_commited_data/pno_ports_subscriptions.csv b/datascience/src/pipeline/data/non_commited_data/pno_ports_subscriptions.csv
new file mode 100644
index 0000000000..d98e97adf4
--- /dev/null
+++ b/datascience/src/pipeline/data/non_commited_data/pno_ports_subscriptions.csv
@@ -0,0 +1,382 @@
+control_unit_id,port_locode,receive_all_pnos
+10004,FRALM,false
+10004,FRPOV,false
+10015,FRSRL,false
+10016,FRCR2,false
+10016,FRLCT,false
+10016,FRPDB,false
+10016,FRPSL,false
+10019,MQKF4,false
+10039,FRAMA,false
+10039,FRCR2,false
+10039,FRETB,false
+10039,FRLCT,false
+10039,FRMRS,false
+10039,FRMTU,false
+10039,FRPDB,false
+10039,FRPSL,false
+10039,FRRYR,false
+10039,FRXSR,false
+10047,YTDZA,false
+10049,FRBES,false
+10054,RELPT,false
+10057,FRBNV,false
+10057,FRGFR,false
+10072,FRROS,false
+10074,FR2VI,false
+10074,FR6AJ,false
+10074,FRAJA,false
+10074,FRBON,false
+10074,FRCM5,false
+10074,FRL5P,false
+10074,FRPRP,false
+10074,FRSOZ,false
+10074,FRTI7,false
+10080,FRBES,false
+10080,FRDRZ,false
+10080,FRGVC,false
+10080,FRHDO,false
+10080,FRLRT,false
+10080,FRROS,false
+10080,FRSQ2,false
+10082,FRAJA,false
+10085,FRROS,false
+10087,MQFDF,false
+10087,MQKF4,false
+10093,FRAS3,false
+10093,FRCJH,false
+10093,FRHID,false
+10093,FRLC5,false
+10093,FRLRH,false
+10093,FRLSO,false
+10093,FRNOI,false
+10093,FRRYN,false
+10093,FRXGV,false
+10099,FRCAM,false
+10099,FRCOC,false
+10099,FRGVC,false
+10099,FRTBE,false
+10108,FRARC,false
+10109,FRHID,false
+10109,FRPRC,false
+10109,FRTBE,false
+10112,FRCG2,false
+10112,FRQUY,false
+10112,FRSML,false
+10112,FRSQ2,false
+10114,BLGUS,false
+10121,FRHON,false
+10121,FRLEH,false
+10122,FRBOL,false
+10122,FRDPE,false
+10122,FRGCP,false
+10122,FRLTR,false
+10122,FRVH2,false
+10128,FRDKK,false
+10137,FRCOC,false
+10137,FRGVC,false
+10137,FRLZF,false
+10142,FRLC5,false
+10142,FRLPE,false
+10142,FRLRH,false
+10142,FRLSO,false
+10142,FRRYN,false
+10148,FRIDY,false
+10148,FRLSO,false
+10155,FR2GX,false
+10155,FRBNV,false
+10155,FRCER,false
+10155,FRF2N,false
+10155,FRGFR,false
+10155,FRVH2,false
+10166,FRCS7,false
+10166,FREMR,false
+10166,FRGIN,false
+10166,FRHYR,false
+10166,FRLU2,false
+10166,FRSRL,false
+10166,FRTLN,false
+10166,FRVNO,false
+10166,FRXBD,false
+10166,FRYNR,false
+10169,FRPPN,false
+10169,GP2P3,false
+10169,GPAP3,false
+10169,GPDP4,false
+10169,GPFP2,false
+10169,GPGPI,false
+10169,GPKP3,false
+10169,GPPTP,false
+10169,MQJFI,false
+10171,FRAS3,false
+10171,FRHID,false
+10171,FRLSO,false
+10171,FRNOI,false
+10171,FRXGV,false
+10176,FRCG2,false
+10176,FRQUY,false
+10176,FRSML,false
+10182,FRNOU,false
+10183,REGLB,false
+10183,RELEU,false
+10183,RELPT,false
+10183,REMRE,false
+10183,REREU,false
+10183,RERSE,false
+10183,RERUN,false
+10183,REZSE,false
+10183,SCPOV,false
+10184,FROUI,false
+10184,FRRTB,false
+10191,FRROS,false
+10192,FRBIA,false
+10192,FRPVO,false
+10192,FRZFB,false
+10194,FRANT,false
+10194,FRCEQ,false
+10194,FRCME,false
+10194,FRETN,false
+10194,FRGJE,false
+10194,FRNCE,false
+10194,FRSJC,false
+10194,FRTS2,false
+10204,FRCG2,false
+10204,FRLQB,false
+10204,FRPAI,false
+10204,FRPE3,false
+10204,FRQUY,false
+10204,FRSQ2,false
+10204,FRTBD,false
+10206,FRLGR,false
+10206,FRPAF,false
+10210,FR2GX,false
+10210,FRBNV,false
+10210,FRCER,false
+10210,FRCTA,false
+10210,FRF2N,false
+10210,FRGFR,false
+10210,FRPBA,false
+10210,FRPI2,false
+10210,FRVH2,false
+10213,FROII,false
+10213,FRPHQ,false
+10213,FRPRC,false
+10213,FRQUI,false
+10213,FRTBE,false
+10219,FRAJA,false
+10219,FRCQI,false
+10219,FREMR,false
+10219,FRHYR,false
+10219,FRLCT,false
+10225,FRARC,false
+10225,FRLM6,false
+10225,FRRYN,false
+10225,FRSV5,false
+10225,FRVI2,false
+10233,FRUTE,false
+10252,FRAJA,false
+10255,FRBG6,false
+10255,FRCJH,false
+10255,FRLC5,false
+10255,FRLPE,false
+10255,FRLRH,false
+10255,FROUB,false
+10255,FRPT4,false
+10255,FRRYN,false
+10255,FRUCM,false
+10264,FRAUD,false
+10264,FRAWR,false
+10264,FRCG2,false
+10264,FRCQ2,false
+10264,FRDUT,false
+10264,FRGN3,false
+10264,FRGVC,false
+10264,FRPAI,false
+10264,FRPBP,false
+10264,FRPE3,false
+10264,FRPLO,false
+10264,FRROS,false
+10264,FRSQ2,false
+10265,GFCAY,false
+10265,GFDDC,false
+10265,GFIRC,false
+10266,FRCBT,false
+10269,FRLQB,false
+10286,FRBOL,false
+10286,FRDPE,false
+10288,FRAUD,false
+10288,FRCAM,false
+10288,FRCOC,false
+10288,FRDRZ,false
+10288,FRGN3,false
+10288,FRGVC,false
+10288,FRKTK,false
+10288,FRLKL,false
+10288,FRLOC,false
+10288,FRLZF,false
+10288,SCPOV,false
+10292,FRAGD,false
+10293,FRANT,false
+10293,FRBZM,false
+10293,FRCEQ,false
+10293,FRNCE,false
+10293,FRSJC,false
+10296,YTMAM,false
+10302,FRCR2,false
+10302,FRLCT,false
+10302,FRMRS,false
+10302,FRMTU,false
+10302,FRRYR,false
+10302,FRXSR,false
+10303,FRALM,false
+10303,FRBCJ,false
+10303,FREBQ,false
+10303,FRNOU,false
+10303,FRPOV,false
+10303,FRPYO,false
+10303,FRS2C,false
+10303,FRUTE,false
+10303,FRWGE,false
+10313,FRANT,false
+10313,FRHYR,false
+10313,FRSFP,false
+10313,FRSTP,false
+10313,FRTLN,false
+10313,FRVFM,false
+10313,FRVNO,false
+10313,FRYNR,false
+10318,FRBOL,false
+10318,FRCQF,false
+10318,FRDKK,false
+10318,FRSVS,false
+10325,FRBOL,false
+10327,MQFDF,false
+10328,ESPAS,false
+10336,FRAZR,false
+10336,FRBO2,false
+10336,FRCM6,false
+10336,FRLRT,false
+10336,FRMHB,false
+10336,FROII,false
+10336,FRQUI,false
+10336,FRTBE,false
+10342,FRGFR,false
+10347,FRSNR,false
+10356,FRPPN,false
+10356,GPDP4,false
+10356,MQFDF,false
+10361,FRAS3,false
+10361,FRCE9,false
+10361,FRGC2,false
+10361,FRHID,false
+10361,FRLDM,false
+10361,FRLSO,false
+10361,FRPRJ,false
+10361,FRXGV,false
+10364,FRCBP,false
+10364,FRCBT,false
+10364,FRZJZ,false
+10374,FRCBT,false
+10378,FRCEQ,false
+10378,FREMR,false
+10378,FRSRL,false
+10380,FRCBP,false
+10380,FRZJZ,false
+10386,FRS2C,false
+10404,FRCOC,false
+10404,FRGVC,false
+10404,FRLC5,false
+10404,FRLRH,false
+10404,FRLSO,false
+10404,FRRYN,false
+10412,FRCIF,false
+10412,FRHON,false
+10412,FRLEH,false
+10412,FROUI,false
+10412,FRTJE,false
+10415,FRCER,false
+10416,FRWGE,false
+10420,FRAGD,false
+10420,FREDH,false
+10420,FRFRO,false
+10420,FRLGR,false
+10420,FRPAF,false
+10420,FRSET,false
+10420,FRVP8,false
+10423,FRDPE,false
+10423,FRFEC,false
+10423,FRLEH,false
+10423,FRLTR,false
+10425,GPKP3,false
+10428,FRCE9,false
+10428,FROII,false
+10428,FRPBF,false
+10428,FRPIR,false
+10428,FRPRC,false
+10428,FRSNR,false
+10428,FRTBE,false
+10429,FRS2C,false
+10430,PMFSP,false
+10433,FRLRH,false
+10434,FRAGD,false
+10434,FRFRO,false
+10434,FRSET,false
+10442,FRAJA,false
+10442,FRBON,false
+10442,FRSOZ,false
+10447,FRBES,false
+10449,FRCM6,false
+10449,FRGV5,false
+10449,FRLP2,false
+10449,FRLR3,false
+10449,FRLRT,false
+10449,FRPT3,false
+10449,FRQUI,false
+10449,FRRZN,false
+10449,FRTP4,false
+10449,FRYSZ,false
+10452,FRAA2,false
+10452,FRCM8,false
+10452,FRDOL,false
+10452,FRDSM,false
+10452,FRGCP,false
+10452,FRHON,false
+10452,FRLEH,false
+10452,FROUI,false
+10452,FRRTB,false
+10452,FRTJE,false
+10455,FRCOC,false
+10455,FRDRZ,false
+10455,FRLRT,false
+10455,FRQUI,false
+10455,FRTBE,false
+10457,FRAUD,false
+10457,FRAWR,false
+10457,FRBES,false
+10457,FRCAM,false
+10457,FRCQ2,false
+10457,FRDUT,false
+10457,FRPLO,false
+10457,FRPR6,false
+10457,FRROS,false
+10462,FRPPN,false
+10462,GPKP3,false
+10471,FRPSL,false
+10484,FRCOC,false
+10484,FRLRT,false
+10484,FRQUI,false
+10489,FRAGD,false
+10489,FRFRO,false
+10489,FRSET,false
+10493,FRROS,false
+10495,FRVNO,false
+10496,FRCG2,false
+10509,FRCM8,false
+10509,FRGCP,false
+10509,FRHON,false
+10509,FRLEH,false
+10509,FROUI,false
+10509,FRRTB,false
+10509,FRTJE,false
+10519,GFCAY,false
+10541,FRROS,false
diff --git a/datascience/src/pipeline/data/non_commited_data/pno_segments_subscriptions.csv b/datascience/src/pipeline/data/non_commited_data/pno_segments_subscriptions.csv
new file mode 100644
index 0000000000..d6ed344ead
--- /dev/null
+++ b/datascience/src/pipeline/data/non_commited_data/pno_segments_subscriptions.csv
@@ -0,0 +1 @@
+control_unit_id,segment
diff --git a/datascience/src/pipeline/data/non_commited_data/pno_vessels_subscriptions.csv b/datascience/src/pipeline/data/non_commited_data/pno_vessels_subscriptions.csv
new file mode 100644
index 0000000000..a62baec1f2
--- /dev/null
+++ b/datascience/src/pipeline/data/non_commited_data/pno_vessels_subscriptions.csv
@@ -0,0 +1 @@
+control_unit_id,cfr
diff --git a/infra/docker/database/upgrade_pg.Dockerfile b/infra/docker/database/upgrade_pg.Dockerfile
index 10e6078cdc..7c5c602e5b 100644
--- a/infra/docker/database/upgrade_pg.Dockerfile
+++ b/infra/docker/database/upgrade_pg.Dockerfile
@@ -4,6 +4,21 @@ ARG TIMESCALEDB_VERSION
 ARG POSTGIS_VERSION
 ARG DISTRIBUTION
 
+############################
+# Build tools binaries in separate image
+############################
+ARG GO_VERSION=1.18.7
+FROM golang:${GO_VERSION}-alpine AS tools
+
+ENV TOOLS_VERSION 0.8.1
+
+RUN apk update && apk add --no-cache git gcc musl-dev \
+    && go install github.com/timescale/timescaledb-tune/cmd/timescaledb-tune@latest \
+    && go install github.com/timescale/timescaledb-parallel-copy/cmd/timescaledb-parallel-copy@latest
+
+############################
+# Now build image and copy in tools
+############################
 FROM postgres:$TO_PG_MAJOR-$DISTRIBUTION
 ARG FROM_PG_MAJOR
 ARG TO_PG_MAJOR
@@ -32,6 +47,8 @@ RUN set -eux; \
 WORKDIR /var/lib/postgresql
 
 COPY infra/docker/database/docker-upgrade /usr/local/bin/
+COPY infra/docker/database/docker-entrypoint-initdb.d/* /docker-entrypoint-initdb.d/
+COPY --from=tools /go/bin/* /usr/local/bin/
 
 ENTRYPOINT ["docker-upgrade"]