diff --git a/docker-compose-slicing-basic-nrf.yaml b/docker-compose-slicing-basic-nrf.yaml
deleted file mode 100644
index 1075db98c3305f3a75e77d1758af66a7b260a0fb..0000000000000000000000000000000000000000
--- a/docker-compose-slicing-basic-nrf.yaml
+++ /dev/null
@@ -1,571 +0,0 @@
-version: '3.8'
-services:
-    mysql:
-        container_name: mysql
-        image: mysql:5.7
-        volumes:
-            - ./oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ./mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh
-        environment:
-            - TZ=Europe/Paris
-            - MYSQL_DATABASE=oai_db
-            - MYSQL_USER=test
-            - MYSQL_PASSWORD=test
-            - MYSQL_ROOT_PASSWORD=linux
-        healthcheck:
-            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.131
-    oai-nssf:
-        container_name: "oai-nssf"
-        image: oai-nssf:develop
-        environment:
-            - INSTANCE=0
-            - TZ=Europe/Paris
-            - PID_DIRECTORY=/var/run
-            - NSSF_NAME=oai-nssf
-            - NSSF_FQDN=nssf.oai-5gcn.eur
-            - SBI_IF_NAME=eth0
-            - SBI_PORT=80
-            - SBI_API_VERSION=v1
-            - SBI_PORT_HTTP1=80
-            - SBI_PORT_HTTP2=8080
-            - NSSF_SLICE_CONFIG=/openair-nssf/etc/nssf_slice_config.json
-        cap_add:
-            - NET_ADMIN
-            - SYS_ADMIN
-        cap_drop:
-            - ALL
-        privileged: true
-        volumes: 
-            - ./nssf_slice_config.json:/openair-nssf/etc/nssf_slice_config.json
-        healthcheck:
-            test: /bin/bash -c "pgrep oai_nssf"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.132
-    oai_udr:
-        container_name: oai-udr
-        image: oai-udr:develop
-        environment:
-            - TZ=Europe/Paris
-            - INSTANCE=0
-            - PID_DIRECTORY=/var/run
-            - UDR_INTERFACE_NAME_FOR_NUDR=eth0
-            - UDR_INTERFACE_PORT_FOR_NUDR=80
-            - UDR_INTERFACE_HTTP2_PORT_FOR_NUDR=8080
-            - UDR_API_VERSION=v1
-            - MYSQL_IPV4_ADDRESS=192.168.70.131
-            - MYSQL_USER=test
-            - MYSQL_PASS=test
-            - MYSQL_DB=oai_db
-            - WAIT_MYSQL=120
-        depends_on:
-            - mysql
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.133
-        volumes:
-            - ./udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh
-        healthcheck:
-            test: /bin/bash -c "/openair-udr/bin/udr-healthcheck.sh"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai_udm:
-        container_name: oai-udm
-        image: oai-udm:develop
-        environment:
-            - TZ=Europe/Paris
-            - INSTANCE=0
-            - PID_DIRECTORY=/var/run
-            - UDM_NAME=OAI_UDM
-            - SBI_IF_NAME=eth0
-            - SBI_PORT=80
-            - UDM_VERSION_NB=v1
-            - USE_FQDN_DNS=yes
-            - UDR_IP_ADDRESS=192.168.70.133
-            - UDR_PORT=80
-            - UDR_VERSION_NB=v1
-            - UDR_FQDN=oai_udr
-        depends_on:
-            - oai_udr
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.134
-        volumes:
-            - ./udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh
-        healthcheck:
-            test: /bin/bash -c "/openair-udm/bin/udm-healthcheck.sh"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai_ausf:
-        container_name: oai-ausf
-        image: oai-ausf:develop
-        environment:
-            - TZ=Europe/Paris
-            - INSTANCE_ID=0
-            - PID_DIR=/var/run
-            - AUSF_NAME=OAI_AUSF
-            - SBI_IF_NAME=eth0
-            - SBI_PORT=80
-            - USE_FQDN_DNS=yes
-            - UDM_IP_ADDRESS=192.168.70.134
-            - UDM_PORT=80
-            - UDM_VERSION_NB=v1
-            - UDM_FQDN=oai_udm
-        depends_on:
-            - oai_udm
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.135
-        volumes:
-            - ./ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh
-        healthcheck:
-            test: /bin/bash -c "/openair-ausf/bin/ausf-healthcheck.sh"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai_nrf_slice12:
-        container_name: oai-nrf-slice12
-        image: oai-nrf:develop
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - NRF_INTERFACE_PORT_FOR_SBI=80
-            - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=8080
-            - NRF_API_VERSION=v1
-            - INSTANCE=0
-            - PID_DIRECTORY=/var/run
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.136
-        volumes:
-            - ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
-        healthcheck:
-            test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai_nrf_slice3:
-        container_name: oai-nrf-slice3
-        image: oai-nrf:develop
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - NRF_INTERFACE_PORT_FOR_SBI=80
-            - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=8080
-            - NRF_API_VERSION=v1
-            - INSTANCE=0
-            - PID_DIRECTORY=/var/run
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.137
-        volumes:
-            - ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
-        healthcheck:
-            test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai_amf:
-        container_name: oai-amf
-        image: oai-amf:develop
-        environment:
-            - TZ=Europe/paris
-            - INSTANCE=0
-            - PID_DIRECTORY=/var/run
-            - MCC=208
-            - MNC=95
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=95
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=95
-            - PLMN_SUPPORT_TAC=0xa000
-            - SST_0=128
-            - SD_0=128
-            - SST_1=129
-            - SD_1=129
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai_smf_slice1
-            - SMF_IPV4_ADDR_0=0.0.0.0
-            - SMF_HTTP_VERSION_0=v1
-            - SELECTED_0=true
-            - SMF_INSTANCE_ID_1=2
-            - SMF_FQDN_1=oai_smf_slice2
-            - SMF_IPV4_ADDR_1=0.0.0.0
-            - SMF_HTTP_VERSION_1=v1
-            - SELECTED_1=false
-            - MYSQL_SERVER=192.168.70.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            - OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d
-            - NRF_IPV4_ADDRESS=0.0.0.0
-            - NRF_PORT=80
-            - NF_REGISTRATION=no
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - EXTERNAL_AUSF=yes
-            - NRF_API_VERSION=v1
-            - NRF_FQDN=oai_nrf_slice12
-            - AUSF_IPV4_ADDRESS=192.168.70.135
-            - AUSF_PORT=80
-            - AUSF_API_VERSION=v1
-            - AUSF_FQDN=oai_ausf
-            - NRF_SELECTION=yes
-            - NSSF_IPV4_ADDRESS=192.168.70.132
-            - NSSF_PORT=80
-            - NSSF_API_VERSION=v1
-            - NSSF_FQDN=oai-nssf
-            - USE_HTTP2=no
-            - INT_ALGO_LIST=["NIA1" , "NIA2"]
-            - CIPH_ALGO_LIST=["NEA1" , "NEA2"]
-        depends_on:
-            - mysql
-            - oai_nrf_slice12
-            - vpp_upf_slice2
-            - oai_ausf
-        volumes:
-            - ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
-        healthcheck:
-            test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
-            interval: 10s
-            timeout: 15s
-            retries: 5
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.138
-    oai_smf_slice1:
-        container_name: oai-smf-slice1
-        image: oai-smf:develop
-        environment:
-            - TZ=Europe/Paris
-            - INSTANCE=0
-            - PID_DIRECTORY=/var/run
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - SMF_INTERFACE_PORT_FOR_SBI=80
-            - SMF_INTERFACE_HTTP2_PORT_FOR_SBI=8080
-            - SMF_API_VERSION=v1
-            - DEFAULT_DNS_IPV4_ADDRESS=192.168.18.129
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=192.168.18.129
-            - AMF_IPV4_ADDRESS=192.168.70.138
-            - AMF_PORT=80
-            - AMF_API_VERSION=v1
-            - AMF_FQDN=oai_amf
-            - UDM_IPV4_ADDRESS=192.168.70.134
-            - UDM_PORT=80
-            - UDM_API_VERSION=v1
-            - UDM_FQDN=oai_udm
-            - UPF_IPV4_ADDRESS=127.0.0.1
-            - UPF_FQDN_0=localhost
-            - NRF_IPV4_ADDRESS=192.168.70.136
-            - NRF_PORT=80
-            - NRF_API_VERSION=v1
-            - NRF_FQDN=oai_nrf_slice12
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - NSSAI_SST0=128
-            - NSSAI_SD0=128
-        depends_on:
-            - oai_amf
-            - oai_nrf_slice12
-        volumes:
-            - ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
-        healthcheck:
-            test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.139
-    oai_smf_slice2:
-        container_name: oai-smf-slice2
-        image: oai-smf:develop
-        environment:
-            - TZ=Europe/Paris
-            - INSTANCE=0
-            - PID_DIRECTORY=/var/run
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - SMF_INTERFACE_PORT_FOR_SBI=80
-            - SMF_INTERFACE_HTTP2_PORT_FOR_SBI=8080
-            - SMF_API_VERSION=v1
-            - DEFAULT_DNS_IPV4_ADDRESS=192.168.18.129
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=192.168.18.129
-            - AMF_IPV4_ADDRESS=192.168.70.138
-            - AMF_PORT=80
-            - AMF_API_VERSION=v1
-            - AMF_FQDN=oai_amf
-            - UDM_IPV4_ADDRESS=192.168.70.134
-            - UDM_PORT=80
-            - UDM_API_VERSION=v1
-            - UDM_FQDN=localhost
-            - UPF_IPV4_ADDRESS=0.0.0.0
-            - UPF_FQDN_0=localhost
-            - NRF_IPV4_ADDRESS=192.168.70.136
-            - NRF_PORT=80
-            - NRF_API_VERSION=v1
-            - NRF_FQDN=oai_nrf_slice12
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_NETWORK_INSTANCE=yes
-            - NSSAI_SST1=129
-            - NSSAI_SD1=129
-        extra_hosts:
-            - "gw1.vppupf.node.5gcn.mnc95.mcc208.3gppnetwork.org:192.168.70.202"
-        depends_on:
-            - oai_amf
-            - oai_nrf_slice12
-        volumes:
-            - ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
-        healthcheck:
-             test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
-             interval: 10s
-             timeout: 5s
-             retries: 5
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.140
-    oai_smf_slice3:
-        container_name: oai-smf-slice3
-        image: oai-smf:develop
-        environment:
-            - TZ=Europe/Paris
-            - INSTANCE=0
-            - PID_DIRECTORY=/var/run
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - SMF_INTERFACE_PORT_FOR_SBI=80
-            - SMF_INTERFACE_HTTP2_PORT_FOR_SBI=8080
-            - SMF_API_VERSION=v1
-            - DEFAULT_DNS_IPV4_ADDRESS=192.168.18.129
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=192.168.18.129
-            - AMF_IPV4_ADDRESS=192.168.70.138
-            - AMF_PORT=80
-            - AMF_API_VERSION=v1
-            - AMF_FQDN=oai_amf
-            - UDM_IPV4_ADDRESS=192.168.70.134
-            - UDM_PORT=80
-            - UDM_API_VERSION=v1
-            - UDM_FQDN=localhost
-            - UPF_IPV4_ADDRESS=0.0.0.0
-            - UPF_FQDN_0=localhost
-            - NRF_IPV4_ADDRESS=192.168.70.137
-            - NRF_PORT=80
-            - NRF_API_VERSION=v1
-            - NRF_FQDN=oai_nrf_slice3
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - NSSAI_SST1=130
-            - NSSAI_SD1=130
-        depends_on:
-            - oai_amf
-            - oai_nrf_slice3
-        volumes:
-            - ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
-        healthcheck:
-             test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
-             interval: 10s
-             timeout: 5s
-             retries: 5
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.141
-    oai_spgwu_slice1:
-        container_name: oai-spgwu-slice1
-        image: oai-spgwu-tiny:develop
-        environment:
-            - TZ=Europe/Paris
-            - PID_DIRECTORY=/var/run
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - BYPASS_UL_PFCP_RULES=no
-            - MCC=208
-            - MNC=95
-            - MNC03=095
-            - TAC=40960
-            - GW_ID=1
-            - REALM=openairinterface.org
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai_spgwu_slice1
-            - NRF_IPV4_ADDRESS=192.168.70.136
-            - NRF_PORT=80
-            - NRF_API_VERSION=v1
-            - NRF_FQDN=oai_nrf_slice12
-            - NSSAI_SST_0=128
-            - NSSAI_SD_0=128
-            - DNN_0=default
-        depends_on:
-            - oai_nrf_slice12
-            - oai_smf_slice1
-        cap_add:
-            - NET_ADMIN
-            - SYS_ADMIN
-        cap_drop:
-            - ALL
-        privileged: true
-        volumes:
-            - ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
-        healthcheck:
-            test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.142
-    vpp_upf_slice2:
-        image: oai-upf-vpp:develop
-        privileged: true
-        container_name: vpp-upf-slice2
-        environment:
-            - NWI_N3=access.oai.org
-            - NWI_N6=core.oai.org
-            - GW_ID=1
-            - MNC03=95
-            - MCC=208
-            - REALM=3gppnetwork.org
-            - NETWORK_UE_IP=12.1.1.0/24
-            - N3_IPV4_ADDRESS_REMOTE=192.168.72.152 #   GNB  IP Address
-            - N4_IPV4_ADDRESS_REMOTE=192.168.70.140 #   SMF  IP Address
-            - N6_IPV4_ADDRESS_REMOTE=192.168.73.137 # EXT-DN IP Address
-            - VPP_MAIN_CORE=0
-            - VPP_CORE_WORKER=1
-            - VPP_PLUGIN_PATH=/usr/lib/x86_64-linux-gnu/vpp_plugins/
-            - INTERFACE_ACCESS=eth1
-            - INTERFACE_CORE=eth2
-            - INTERFACE_CP=eth0
-            - NSSAI_SD_0=129
-            - SST=129
-            - DNN=oai
-            - REGISTER_NRF=yes
-            - NRF_IP_ADDR=192.168.70.136
-            - NRF_PORT=8080
-            - HTTP_VERSION=2
-        depends_on:
-            - oai_nrf_slice12
-        healthcheck:
-            test: /bin/bash -c "pgrep vpp"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.143
-            public_net_access:
-                ipv4_address: 192.168.72.143
-            public_net_core:
-                ipv4_address: 192.168.73.143
-    oai_spgwu_slice3:
-        container_name: oai-spgwu-slice3
-        image: oai-spgwu-tiny:develop
-        environment:
-            - TZ=Europe/Paris
-            - PID_DIRECTORY=/var/run
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.2.1.0/24
-            - BYPASS_UL_PFCP_RULES=no
-            - MCC=208
-            - MNC=95
-            - MNC03=095
-            - TAC=40960
-            - GW_ID=1
-            - REALM=openairinterface.org
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai_spgwu_slice3
-            - NRF_IPV4_ADDRESS=192.168.70.137
-            - NRF_PORT=80
-            - NRF_API_VERSION=v1
-            - NRF_FQDN=oai_nrf_slice3
-            - NSSAI_SST_0=130
-            - NSSAI_SD_0=130
-            - DNN_0=oai.ipv4
-        depends_on:
-            - oai_nrf_slice3
-            - oai_smf_slice3
-        cap_add:
-            - NET_ADMIN
-            - SYS_ADMIN
-        cap_drop:
-            - ALL
-        privileged: true
-        volumes:
-            - ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
-        healthcheck:
-            test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.144
-    oai_ext_dn:
-        image: ubuntu:bionic
-        privileged: true
-        container_name: oai-ext-dn
-        entrypoint: /bin/bash -c \
-              "apt update; apt install -y iptables iproute2 iperf3 iputils-ping;"\
-              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
-              "ip route add 12.1.1.2/32 via 192.168.70.142 dev eth0;"\
-              "ip route add 12.2.1.1/32 via 192.168.70.144 dev eth0;"\
-              "ip route add 12.1.1.129/32 via 192.168.73.202 dev eth1; sleep infinity"
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.145
-            public_net_core:
-                ipv4_address: 192.168.73.145
-networks:
-    public_net:
-        driver: bridge
-        name: demo-oai-public-net
-        ipam:
-            config:
-                - subnet: 192.168.70.0/24
-        driver_opts:
-            com.docker.network.bridge.name: "demo-oai"
-    public_net_access:
-        name: oai-public-access
-        ipam:
-            config:
-                - subnet: 192.168.72.0/24
-        driver_opts:
-            com.docker.network.bridge.name: "access"
-    public_net_core:
-        name: oai-public-core
-        ipam:
-            config:
-                - subnet: 192.168.73.0/24
-        driver_opts:
-            com.docker.network.bridge.name: "core"
diff --git a/docker-compose-slicing-ransim.yaml b/docker-compose-slicing-ransim.yaml
deleted file mode 100644
index b81412d9e2057a8974259d763b959c652fed40e5..0000000000000000000000000000000000000000
--- a/docker-compose-slicing-ransim.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-version: '3.8'
-services:
-    gnbsim_slice1:
-        container_name: gnbsim_slice1
-        image: gnbsim:latest
-        privileged: true
-        environment:
-            - MCC=208
-            - MNC=95
-            - GNBID=5
-            - TAC=0x00a000
-            - SST=128
-            - SD=000080
-            - PagingDRX=v32
-            - RANUENGAPID=0
-            - IMEISV=35609204079514
-            - MSIN=0000000035
-            - RoutingIndicator=1234
-            - ProtectionScheme=null
-            - KEY=0C0A34601D4F07677303652C0462535B
-            - OPc=63bfa50ee6523365ff14c1f45f88737d
-            - DNN=default
-            - URL=http://www.asnt.org:8080/
-            - NRCellID=1
-            - USE_FQDN=no
-            - NGAPPeerAddr=192.168.70.138
-            - GTPuLocalAddr=192.168.70.151
-            - GTPuIFname=eth0
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.151
-        healthcheck:
-            test: /bin/bash -c "ifconfig gtp-gnb"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    ueransim_slice2:
-        container_name: ueransim_slice2
-        image: ueransim:latest
-        privileged: true
-        environment:
-            # GNB Congig Parameters
-            - MCC=208
-            - MNC=95
-            - NCI=0x000000010
-            - TAC=0xa000
-            - LINK_IP=192.168.70.152
-            - NGAP_IP=192.168.70.152
-            - GTP_IP=192.168.72.152
-            - NGAP_PEER_IP=192.168.70.138
-            - SST=129
-            - SD=129
-            - IGNORE_STREAM_IDS=true
-            # UE Config Parameters
-            - NUMBER_OF_UE=1
-            - IMSI=208950000000036
-            - KEY=0C0A34601D4F07677303652C0462535B
-            - OP=63bfa50ee6523365ff14c1f45f88737d
-            - OP_TYPE=OPC
-            - AMF_VALUE=8000
-            - IMEI=356938035643803
-            - IMEI_SV=0035609204079514
-            - GNB_IP_ADDRESS=192.168.70.152
-            - PDU_TYPE=IPv4
-            - APN=oai
-            - SST_C=1
-            - SD_C=1
-            - SST_D=1
-            - SD_D=1
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.152
-            public_net_access:
-                ipv4_address: 192.168.72.152
-        healthcheck:
-            test: /bin/bash -c "ifconfig uesimtun0"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    gnbsim_slice3:
-        container_name: gnbsim_slice3
-        image: gnbsim:latest
-        privileged: true
-        environment:
-            - MCC=208
-            - MNC=95
-            - GNBID=5
-            - TAC=0x00a000
-            - SST=130
-            - SD=000082
-            - PagingDRX=v32
-            - RANUENGAPID=0
-            - IMEISV=35609204079514
-            - MSIN=0000000037
-            - RoutingIndicator=1234
-            - ProtectionScheme=null
-            - KEY=0C0A34601D4F07677303652C0462535B
-            - OPc=63bfa50ee6523365ff14c1f45f88737d
-            - DNN=oai.ipv4
-            - URL=http://www.asnt.org:8080/
-            - NRCellID=1
-            - USE_FQDN=no
-            - NGAPPeerAddr=192.168.70.138
-            - GTPuLocalAddr=192.168.70.153
-            - GTPuIFname=eth0
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.153
-        healthcheck:
-            test: /bin/bash -c "ifconfig gtp-gnb"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-networks:
-    public_net:
-        external:
-            name: demo-oai-public-net
-    public_net_access:
-        external:
-            name: oai-public-access
diff --git a/docs/DEPLOY_SA5G_SLICING.md b/docs/DEPLOY_SA5G_SLICING.md
index b7fa492bd9f5f55b943505ca1f65a0643da3ba7a..2aa3ba4d431cb983f1acf88f27f2a1b13ac7da60 100644
--- a/docs/DEPLOY_SA5G_SLICING.md
+++ b/docs/DEPLOY_SA5G_SLICING.md
@@ -40,15 +40,15 @@ You can also retrieve the images from `docker-hub`. See [Retrieving images](./RE
 
 | CNF Name    | Branch Name    | Tag used at time of writing   | Ubuntu 18.04 | RHEL8          |
 | ----------- |:-------------- | ----------------------------- | ------------ | ---------------|
-| NSSF        | `develop`      | `v1.2.1`                      | X            | X              |
-| AMF         | `develop`      | `v1.2.1`                      | X            | X              |
-| AUSF        | `develop`      | `v1.2.1`                      | X            | X              |
-| NRF         | `develop`      | `v1.2.1`                      | X            | X              |
-| SMF         | `develop`      | `v1.2.1`                      | X            | X              |
-| UDR         | `develop`      | `v1.2.1`                      | X            | X              |
-| UDM         | `develop`      | `v1.2.1`                      | X            | X              |
-| SPGWU       | `develop`      | `v1.2.1`                      | X            | X              |
-| UPF-VPP     | `develop`      | `v1.2.1`                      | X            | X              |
+| NSSF        | `develop`      | `v1.3.0`                      | X            | X              |
+| AMF         | `develop`      | `v1.3.0`                      | X            | X              |
+| AUSF        | `develop`      | `v1.3.0`                      | X            | X              |
+| NRF         | `develop`      | `v1.3.0`                      | X            | X              |
+| SMF         | `develop`      | `v1.3.0`                      | X            | X              |
+| UDR         | `develop`      | `v1.3.0`                      | X            | X              |
+| UDM         | `develop`      | `v1.3.0`                      | X            | X              |
+| SPGWU       | `develop`      | `v1.1.5`                      | X            | X              |
+| UPF-VPP     | `develop`      | `v1.3.0`                      | X            | X              |
 
 <br/>
 
@@ -59,12 +59,14 @@ In this tutorial we are going to explore slicing feature of OAI 5G core network.
 * AMF selection based on S-NSSAI (With help of NSSF - Next Release, March 2022)
 * Single UE with multiple S-NSSAIs (With the help of commercial tool dsTest)
 
-A Network Slice is defined within a PLMN and it incorporates the 5G Core and 5G RAN components. Network slice is identified as Single Network Slice Selection Assistance Information (S-NSSAI). A S-NSSAI is consist of Slice/Service type (SST) and Slice Differentiator (SD). SST is mandatory filed which defines expected slice behavior in terms of features and services. Whereas SD is optional field which can be used to differentiate amongst multiple slices. Currently 3GPP allows up to eight (8) S-NSSAIs in the NSSAI sent in signaling messages between the UE and the Network, means a single UE may be served by at most eight Network Slices at a time. SST length is 8 bits so it can provides 2^8= 256 SST values from which there are reserved values O to 127 for standardized SSTs (e.g. SST 2 = URLCC, SST 3 = MIoT, SST 4 = V2X etc.). 
+A Network Slice is defined within a PLMN and it incorporates the 5G Core and 5G RAN components. Network slice is identified as Single Network Slice Selection Assistance Information (S-NSSAI). A S-NSSAI consists of Slice/Service type (SST) and Slice Differentiator (SD). SST is mandatory filed which defines expected slice behavior in terms of features and services. Whereas SD is optional field which can be used to differentiate amongst multiple slices. 
+
+Currently 3GPP allows up to eight (8) S-NSSAIs in the NSSAI sent in signaling messages between the UE and the Network, it means a single UE may be served by at most eight Network Slices at a time. SST length is 8 bits; so it can provides 2^8= 256 SST values from which there are reserved values O to 127 for standardized SSTs (e.g. SST 2 = URLCC, SST 3 = MIoT, SST 4 = V2X etc.). 
 
 ###### Slicing current status in OAI 5G CN -
-* Role of NSSF -> NSSF currently supports, slice slection during pdu session establishment request. When AMF is not locally configured with NRF information, then with the help of NSSF it discovers appropriate NRF based on S-NSSAI provided.
-* Role of AMF  -> AMF slectes first available SMF from the NF instance list (of SMF) provided by appropriate NRF.
-* Role od SMF  -> SMF can associates with multiple UPFs at same time as in slice 2 and 3 from above figure. UPF is selected here based on S-NSSAI and DNN.
+* Role of NSSF -> NSSF currently supports slice selection during pdu session establishment request. When AMF is not locally configured with NRF information, then with the help of NSSF, it discovers an appropriate NRF based on S-NSSAI provided.
+* Role of AMF  -> AMF selectes first available SMF from the NF instance list (of SMF instances) provided by appropriate NRF.
+* Role od SMF  -> SMF can associate with multiple UPFs at same time as in slice 2 and 3 from above figure. UPF is selected here based on S-NSSAI and DNN.
 
 As shown in figure above, there are 3 S-NSSAIs configured (Can be differentiated with colors) viz. <br/>
 Note:- Here we have used standardised SST values (2,3,4), because rf-simulator only supports SST values 1,2,3,4. Moreover, it only for numerical refernece and does not reflect standrd SST behaviour e.g. URLCC, MIoT, V2X etc.<br/>
@@ -128,7 +130,7 @@ bf6544a04f1f   oai-nssf:develop         "/bin/bash /openair-…"   51 seconds ag
 
 ## 6. Getting a `ransim` docker images ##
 
-We are using 3 different ran simulators viz. [ueransim](https://github.com/aligungr/UERANSIM), [rfsimulator](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/develop/ci-scripts/yaml_files/5g_rfsimulator) and [gnbsim](https://gitlab.eurecom.fr/kharade/gnbsim) for slice 2, 3 and 4 repectively. Each of them has there set of features, and one can use as per need basis. Different ransimulator usage mimics here, the realistic deployemnt scenario where operator can have multi vendor devices deployed  in the network. <br/>
+We are using 3 different ran simulators: [ueransim](https://github.com/aligungr/UERANSIM), [rfsimulator](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/develop/ci-scripts/yaml_files/5g_rfsimulator) and [gnbsim](https://gitlab.eurecom.fr/kharade/gnbsim) for slice 2, 3 and 4 repectively. Each of them has their own set of features, and one can use as per need basis. Different ran simulator usage mimics here the realistic deployemnt scenario where operator can have multi vendor devices deployed  in the network. <br/>
 
 You can pull docker images from official repositories as below -
 
@@ -254,14 +256,15 @@ $
 | [5gcn-deployment-slicing.pcap](./results/slicing/pcap/5gcn-deployment-slicing.pcap)        |
 
 ## 10. UE with multiple S-NSSAIs ##
-OAI 5G CN also supports UE with multiple slice, Appereantly ransimulators that we have validated are does not support UE with multiple slice at a time.
-Hence, we have validated this feature using commercial testing tool [dsTest](https://www.developingsolutions.com/products/about-dstest/). This test case is integrated in our [CI pipeline for NSSF](https://jenkins-oai.eurecom.fr/view/CN5G/job/OAI-CN5G-NSSF/) and AMF. Pipeline triggers deployement scenario as shown in figure below with two slices. During PDU session establishment request, AMF queries NSSF for NSI information with appropriate NRF Id. And then again corresponding SMF anf UPF is slected in the NSI, based on S-NSSAI provided. You can verify this scenario from the [pcap](https://jenkins-oai.eurecom.fr/view/CN5G/job/OAI-CN5G-NSSF/lastSuccessfulBuild/artifact/docker_logs.zip).
+OAI 5G CN also supports UE with multiple slices, Appereantly the ran simulators, that we have validated, do not support UE with multiple slices at once.
+
+Hence, we have validated this feature using commercial testing tool [dsTest](https://www.developingsolutions.com/products/about-dstest/). This test case is integrated in our [CI pipeline for NSSF](https://jenkins-oai.eurecom.fr/view/CN5G/job/OAI-CN5G-NSSF/) and AMF. Pipeline triggers a deployment scenario as shown in figure below with two slices. During PDU session establishment request, AMF queries NSSF for NSI information with appropriate NRF Id. And then again corresponding SMF anf UPF is slected in the NSI, based on S-NSSAI provided. You can verify this scenario from the [pcap](https://jenkins-oai.eurecom.fr/view/CN5G/job/OAI-CN5G-NSSF/lastSuccessfulBuild/artifact/docker_logs.zip).
 
 ![Multislice](./images/5gcn_slicing_ue_multislice.png)
 
 ## 11. Undeploy network ##
 * Use docker-compose down to undeploy network <br/>
-Undeploy RAN
+### 11.1. Undeploy RAN
 ```bash
 $ docker-compose -f docker-compose-slicing-ransim.yaml down
 Stopping ueransim           ... done
@@ -275,7 +278,7 @@ Network demo-oai-public-net is external, skipping
 Network oai-public-access is external, skipping
 ```
 
-Undeploy 5GCN
+### 11.2. Undeploy 5GCN
 
 ```bash
 $ docker-compose -f docker-compose-slicing-basic-nrf.yaml down
diff --git a/nssf_slice_config.json b/nssf_slice_config.json
deleted file mode 100644
index 61ee52a3fd1537380bf03b5ad80e46ca744af2ac..0000000000000000000000000000000000000000
--- a/nssf_slice_config.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-    "info": {
-       "version": "1.0.0",
-       "description": "OAI-NSSF initial local configuration"
-    },
-    "configuration": {
-       "nsiInfoList": [
-          {
-             "snssai": {
-                "sst": 128,
-                "sd": "128"
-             },
-             "nsiInformationList":{
-                   "nrfId": "http://192.168.70.136:80/nnrf-nfm/v1/nf-instances",
-                   "nsiId": "11"
-                }
-          },
-          {
-             "snssai": {
-                "sst": 129,
-                "sd": "129"
-             },
-             "nsiInformationList": {
-               "nrfId": "http://192.168.70.136:80/nnrf-nfm/v1/nf-instances",
-               "nsiId": "12"
-                }
-          },
-          {
-            "snssai": {
-               "sst": 130,
-               "sd": "130"
-            },
-            "nsiInformationList": {
-              "nrfId": "http://192.168.70.137:80/nnrf-nfm/v1/nf-instances",
-              "nsiId": "12"
-               }
-         }
-       ],
-       "taInfoList": [
-          {
-             "tai": {
-                "plmnId": {
-                   "mcc": "208",
-                   "mnc": "95"
-                },
-                "tac": "33456"
-             },
-             "supportedSnssaiList": [
-                {
-                   "sst": 222,
-                   "sd": 123
-                },
-                {
-                   "sst": 1,
-                   "sd": 2
-                },
-                {
-                   "sst": 2
-                }
-             ]
-          },
-          {
-             "tai": {
-                "plmnId": {
-                   "mcc": "208",
-                   "mnc": "92"
-                },
-                "tac": "33458"
-             },
-             "supportedSnssaiList": [
-                {
-                   "sst": 1
-                },
-                {
-                   "sst": 1,
-                   "sd": 1
-                },
-                {
-                   "sst": 1,
-                   "sd": 3
-                },
-                {
-                   "sst": 2
-                }
-             ],
-             "restrictedSnssaiList": [
-                {
-                   "homePlmnId": {
-                      "mcc": 208,
-                      "mnc": 97
-                   },
-                   "sNssaiList": [
-                      {
-                         "sst": 1,
-                         "sd": 3
-                      }
-                   ]
-                }
-             ]
-          },
-          {
-             "tai": {
-                "plmnId": {
-                   "mcc": "208",
-                   "mnc": "95"
-                },
-                "tac": "33459"
-             },
-             "supportedSnssaiList": [
-                {
-                   "sst": 1
-                },
-                {
-                   "sst": 1,
-                   "sd": 1
-                },
-                {
-                   "sst": 2
-                },
-                {
-                   "sst": 2,
-                   "sd": 1
-                }
-             ]
-          }
-       ],
-       "plmnInfoList": [
-          {
-             "operatorName": "OpenairInterface",
-             "homePlmnId": {
-                "mcc": 208,
-                "mnc": 95
-             }
-          },
-          {
-             "operatorName": "Eurecom",
-             "homePlmnId": {
-                "mcc": 208,
-                "mnc": 96
-             }
-          }
-       ]
-    }
- }
diff --git a/oai_db2.sql b/oai_db2.sql
deleted file mode 100755
index df528fdfa98cd9bc8da82859770fa17ce65f4dcc..0000000000000000000000000000000000000000
--- a/oai_db2.sql
+++ /dev/null
@@ -1,318 +0,0 @@
--- phpMyAdmin SQL Dump
--- version 5.1.0
--- https://www.phpmyadmin.net/
---
--- Host: 172.16.200.10:3306
--- Generation Time: Mar 22, 2021 at 10:31 AM
--- Server version: 5.7.33
--- PHP Version: 7.4.15
-
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-START TRANSACTION;
-SET time_zone = "+00:00";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
-
---
--- Database: `oai_db`
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table `AccessAndMobilitySubscriptionData`
---
-
-CREATE TABLE `AccessAndMobilitySubscriptionData` (
-  `ueid` varchar(15) NOT NULL,
-  `servingPlmnid` varchar(15) NOT NULL,
-  `supportedFeatures` varchar(50) DEFAULT NULL,
-  `gpsis` json DEFAULT NULL,
-  `internalGroupIds` json DEFAULT NULL,
-  `sharedVnGroupDataIds` json DEFAULT NULL,
-  `subscribedUeAmbr` json DEFAULT NULL,
-  `nssai` json DEFAULT NULL,
-  `ratRestrictions` json DEFAULT NULL,
-  `forbiddenAreas` json DEFAULT NULL,
-  `serviceAreaRestriction` json DEFAULT NULL,
-  `coreNetworkTypeRestrictions` json DEFAULT NULL,
-  `rfspIndex` int(10) DEFAULT NULL,
-  `subsRegTimer` int(10) DEFAULT NULL,
-  `ueUsageType` int(10) DEFAULT NULL,
-  `mpsPriority` tinyint(1) DEFAULT NULL,
-  `mcsPriority` tinyint(1) DEFAULT NULL,
-  `activeTime` int(10) DEFAULT NULL,
-  `sorInfo` json DEFAULT NULL,
-  `sorInfoExpectInd` tinyint(1) DEFAULT NULL,
-  `sorafRetrieval` tinyint(1) DEFAULT NULL,
-  `sorUpdateIndicatorList` json DEFAULT NULL,
-  `upuInfo` json DEFAULT NULL,
-  `micoAllowed` tinyint(1) DEFAULT NULL,
-  `sharedAmDataIds` json DEFAULT NULL,
-  `odbPacketServices` json DEFAULT NULL,
-  `serviceGapTime` int(10) DEFAULT NULL,
-  `mdtUserConsent` json DEFAULT NULL,
-  `mdtConfiguration` json DEFAULT NULL,
-  `traceData` json DEFAULT NULL,
-  `cagData` json DEFAULT NULL,
-  `stnSr` varchar(50) DEFAULT NULL,
-  `cMsisdn` varchar(50) DEFAULT NULL,
-  `nbIoTUePriority` int(10) DEFAULT NULL,
-  `nssaiInclusionAllowed` tinyint(1) DEFAULT NULL,
-  `rgWirelineCharacteristics` varchar(50) DEFAULT NULL,
-  `ecRestrictionDataWb` json DEFAULT NULL,
-  `ecRestrictionDataNb` tinyint(1) DEFAULT NULL,
-  `expectedUeBehaviourList` json DEFAULT NULL,
-  `primaryRatRestrictions` json DEFAULT NULL,
-  `secondaryRatRestrictions` json DEFAULT NULL,
-  `edrxParametersList` json DEFAULT NULL,
-  `ptwParametersList` json DEFAULT NULL,
-  `iabOperationAllowed` tinyint(1) DEFAULT NULL,
-  `wirelineForbiddenAreas` json DEFAULT NULL,
-  `wirelineServiceAreaRestriction` json DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `Amf3GppAccessRegistration`
---
-
-CREATE TABLE `Amf3GppAccessRegistration` (
-  `ueid` varchar(15) NOT NULL,
-  `amfInstanceId` varchar(50) NOT NULL,
-  `supportedFeatures` varchar(50) DEFAULT NULL,
-  `purgeFlag` tinyint(1) DEFAULT NULL,
-  `pei` varchar(50) DEFAULT NULL,
-  `imsVoPs` json DEFAULT NULL,
-  `deregCallbackUri` varchar(50) NOT NULL,
-  `amfServiceNameDereg` json DEFAULT NULL,
-  `pcscfRestorationCallbackUri` varchar(50) DEFAULT NULL,
-  `amfServiceNamePcscfRest` json DEFAULT NULL,
-  `initialRegistrationInd` tinyint(1) DEFAULT NULL,
-  `guami` json NOT NULL,
-  `backupAmfInfo` json DEFAULT NULL,
-  `drFlag` tinyint(1) DEFAULT NULL,
-  `ratType` json NOT NULL,
-  `urrpIndicator` tinyint(1) DEFAULT NULL,
-  `amfEeSubscriptionId` varchar(50) DEFAULT NULL,
-  `epsInterworkingInfo` json DEFAULT NULL,
-  `ueSrvccCapability` tinyint(1) DEFAULT NULL,
-  `registrationTime` varchar(50) DEFAULT NULL,
-  `vgmlcAddress` json DEFAULT NULL,
-  `contextInfo` json DEFAULT NULL,
-  `noEeSubscriptionInd` tinyint(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `AuthenticationStatus`
---
-
-CREATE TABLE `AuthenticationStatus` (
-  `ueid` varchar(20) NOT NULL,
-  `nfInstanceId` varchar(50) NOT NULL,
-  `success` tinyint(1) NOT NULL,
-  `timeStamp` varchar(50) NOT NULL,
-  `authType` varchar(25) NOT NULL,
-  `servingNetworkName` varchar(50) NOT NULL,
-  `authRemovalInd` tinyint(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `AuthenticationSubscription`
---
-
-CREATE TABLE `AuthenticationSubscription` (
-  `ueid` varchar(20) NOT NULL,
-  `authenticationMethod` varchar(25) NOT NULL,
-  `encPermanentKey` varchar(50) DEFAULT NULL,
-  `protectionParameterId` varchar(50) DEFAULT NULL,
-  `sequenceNumber` json DEFAULT NULL,
-  `authenticationManagementField` varchar(50) DEFAULT NULL,
-  `algorithmId` varchar(50) DEFAULT NULL,
-  `encOpcKey` varchar(50) DEFAULT NULL,
-  `encTopcKey` varchar(50) DEFAULT NULL,
-  `vectorGenerationInHss` tinyint(1) DEFAULT NULL,
-  `n5gcAuthMethod` varchar(15) DEFAULT NULL,
-  `rgAuthenticationInd` tinyint(1) DEFAULT NULL,
-  `supi` varchar(20) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `AuthenticationSubscription`
---
-
-INSERT INTO `AuthenticationSubscription` (`ueid`, `authenticationMethod`, `encPermanentKey`, `protectionParameterId`, `sequenceNumber`, `authenticationManagementField`, `algorithmId`, `encOpcKey`, `encTopcKey`, `vectorGenerationInHss`, `n5gcAuthMethod`, `rgAuthenticationInd`, `supi`) VALUES
-('208950000000031', '5G_AKA', '0C0A34601D4F07677303652C0462535B', '0C0A34601D4F07677303652C0462535B', '{\"sqn\": \"000000000020\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', '63bfa50ee6523365ff14c1f45f88737d', NULL, NULL, NULL, NULL, '208950000000031'),
-('208950000000032', '5G_AKA', '0C0A34601D4F07677303652C0462535B', '0C0A34601D4F07677303652C0462535B', '{\"sqn\": \"000000000020\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', '63bfa50ee6523365ff14c1f45f88737d', NULL, NULL, NULL, NULL, '208950000000032'),
-('208950000000033', '5G_AKA', '0C0A34601D4F07677303652C0462535B', '0C0A34601D4F07677303652C0462535B', '{\"sqn\": \"000000000020\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', '63bfa50ee6523365ff14c1f45f88737d', NULL, NULL, NULL, NULL, '208950000000033'),
-('208950000000034', '5G_AKA', '0C0A34601D4F07677303652C0462535B', '0C0A34601D4F07677303652C0462535B', '{\"sqn\": \"000000000020\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', '63bfa50ee6523365ff14c1f45f88737d', NULL, NULL, NULL, NULL, '208950000000034'),
-('208950000000035', '5G_AKA', '0C0A34601D4F07677303652C0462535B', '0C0A34601D4F07677303652C0462535B', '{\"sqn\": \"000000000020\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', '63bfa50ee6523365ff14c1f45f88737d', NULL, NULL, NULL, NULL, '208950000000035'),
-('208950000000036', '5G_AKA', '0C0A34601D4F07677303652C0462535B', '0C0A34601D4F07677303652C0462535B', '{\"sqn\": \"000000000020\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', '63bfa50ee6523365ff14c1f45f88737d', NULL, NULL, NULL, NULL, '208950000000036'),
-('208950000000037', '5G_AKA', '0C0A34601D4F07677303652C0462535B', '0C0A34601D4F07677303652C0462535B', '{\"sqn\": \"000000000020\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', '63bfa50ee6523365ff14c1f45f88737d', NULL, NULL, NULL, NULL, '208950000000037'),
-('208950000000038', '5G_AKA', '0C0A34601D4F07677303652C0462535B', '0C0A34601D4F07677303652C0462535B', '{\"sqn\": \"000000000020\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', '63bfa50ee6523365ff14c1f45f88737d', NULL, NULL, NULL, NULL, '208950000000038'),
-('208950000000039', '5G_AKA', '0C0A34601D4F07677303652C0462535B', '0C0A34601D4F07677303652C0462535B', '{\"sqn\": \"000000000020\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', '63bfa50ee6523365ff14c1f45f88737d', NULL, NULL, NULL, NULL, '208950000000039'),
-('208950000000040', '5G_AKA', '0C0A34601D4F07677303652C0462535B', '0C0A34601D4F07677303652C0462535B', '{\"sqn\": \"000000000020\", \"sqnScheme\": \"NON_TIME_BASED\", \"lastIndexes\": {\"ausf\": 0}}', '8000', 'milenage', '63bfa50ee6523365ff14c1f45f88737d', NULL, NULL, NULL, NULL, '208950000000040');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `SdmSubscriptions`
---
-
-CREATE TABLE `SdmSubscriptions` (
-  `ueid` varchar(15) NOT NULL,
-  `subsId` int(10) UNSIGNED NOT NULL,
-  `nfInstanceId` varchar(50) NOT NULL,
-  `implicitUnsubscribe` tinyint(1) DEFAULT NULL,
-  `expires` varchar(50) DEFAULT NULL,
-  `callbackReference` varchar(50) NOT NULL,
-  `amfServiceName` json DEFAULT NULL,
-  `monitoredResourceUris` json NOT NULL,
-  `singleNssai` json DEFAULT NULL,
-  `dnn` varchar(50) DEFAULT NULL,
-  `subscriptionId` varchar(50) DEFAULT NULL,
-  `plmnId` json DEFAULT NULL,
-  `immediateReport` tinyint(1) DEFAULT NULL,
-  `report` json DEFAULT NULL,
-  `supportedFeatures` varchar(50) DEFAULT NULL,
-  `contextInfo` json DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `SessionManagementSubscriptionData`
---
-
-CREATE TABLE `SessionManagementSubscriptionData` (
-  `ueid` varchar(15) NOT NULL,
-  `servingPlmnid` varchar(15) NOT NULL,
-  `singleNssai` json NOT NULL,
-  `dnnConfigurations` json DEFAULT NULL,
-  `internalGroupIds` json DEFAULT NULL,
-  `sharedVnGroupDataIds` json DEFAULT NULL,
-  `sharedDnnConfigurationsId` varchar(50) DEFAULT NULL,
-  `odbPacketServices` json DEFAULT NULL,
-  `traceData` json DEFAULT NULL,
-  `sharedTraceDataId` varchar(50) DEFAULT NULL,
-  `expectedUeBehavioursList` json DEFAULT NULL,
-  `suggestedPacketNumDlList` json DEFAULT NULL,
-  `3gppChargingCharacteristics` varchar(50) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `SmfRegistrations`
---
-
-CREATE TABLE `SmfRegistrations` (
-  `ueid` varchar(15) NOT NULL,
-  `subpduSessionId` int(10) NOT NULL,
-  `smfInstanceId` varchar(50) NOT NULL,
-  `smfSetId` varchar(50) DEFAULT NULL,
-  `supportedFeatures` varchar(50) DEFAULT NULL,
-  `pduSessionId` int(10) NOT NULL,
-  `singleNssai` json NOT NULL,
-  `dnn` varchar(50) DEFAULT NULL,
-  `emergencyServices` tinyint(1) DEFAULT NULL,
-  `pcscfRestorationCallbackUri` varchar(50) DEFAULT NULL,
-  `plmnId` json NOT NULL,
-  `pgwFqdn` varchar(50) DEFAULT NULL,
-  `epdgInd` tinyint(1) DEFAULT NULL,
-  `deregCallbackUri` varchar(50) DEFAULT NULL,
-  `registrationReason` json DEFAULT NULL,
-  `registrationTime` varchar(50) DEFAULT NULL,
-  `contextInfo` json DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `SmfSelectionSubscriptionData`
---
-
-CREATE TABLE `SmfSelectionSubscriptionData` (
-  `ueid` varchar(15) NOT NULL,
-  `servingPlmnid` varchar(15) NOT NULL,
-  `supportedFeatures` varchar(50) DEFAULT NULL,
-  `subscribedSnssaiInfos` json DEFAULT NULL,
-  `sharedSnssaiInfosId` varchar(50) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Indexes for dumped tables
---
-
---
--- Indexes for table `AccessAndMobilitySubscriptionData`
---
-ALTER TABLE `AccessAndMobilitySubscriptionData`
-  ADD PRIMARY KEY (`ueid`,`servingPlmnid`) USING BTREE;
-
---
--- Indexes for table `Amf3GppAccessRegistration`
---
-ALTER TABLE `Amf3GppAccessRegistration`
-  ADD PRIMARY KEY (`ueid`);
-
---
--- Indexes for table `AuthenticationStatus`
---
-ALTER TABLE `AuthenticationStatus`
-  ADD PRIMARY KEY (`ueid`);
-
---
--- Indexes for table `AuthenticationSubscription`
---
-ALTER TABLE `AuthenticationSubscription`
-  ADD PRIMARY KEY (`ueid`);
-
---
--- Indexes for table `SdmSubscriptions`
---
-ALTER TABLE `SdmSubscriptions`
-  ADD PRIMARY KEY (`subsId`,`ueid`) USING BTREE;
-
---
--- Indexes for table `SessionManagementSubscriptionData`
---
-ALTER TABLE `SessionManagementSubscriptionData`
-  ADD PRIMARY KEY (`ueid`,`servingPlmnid`) USING BTREE;
-
---
--- Indexes for table `SmfRegistrations`
---
-ALTER TABLE `SmfRegistrations`
-  ADD PRIMARY KEY (`ueid`,`subpduSessionId`) USING BTREE;
-
---
--- Indexes for table `SmfSelectionSubscriptionData`
---
-ALTER TABLE `SmfSelectionSubscriptionData`
-  ADD PRIMARY KEY (`ueid`,`servingPlmnid`) USING BTREE;
-
---
--- AUTO_INCREMENT for dumped tables
---
-
---
--- AUTO_INCREMENT for table `SdmSubscriptions`
---
-ALTER TABLE `SdmSubscriptions`
-  MODIFY `subsId` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3;
-COMMIT;
-
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-