diff --git a/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network b/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network
index 92e630b645..6886d538f7 100755
--- a/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network
+++ b/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network
@@ -103,10 +103,6 @@ upcase() {
 
 gen_iface_conf() {
     cat <<EOT
-DEVICE=$DEV
-BOOTPROTO=none
-ONBOOT=yes
-TYPE=Ethernet
 NETMASK=$MASK
 IPADDR=$IP
 EOT
@@ -118,6 +114,19 @@ EOT
     echo ""
 }
 
+gen_iface6_conf() {
+    cat <<EOT
+IPV6INIT=yes
+IPV6ADDR=$IPV6
+EOT
+
+    if [ -n "$GATEWAY6" ]; then
+      echo "IPV6_DEFAULTGW=$GATEWAY6"
+    fi
+
+    echo ""
+}
+
 gen_network_configuration()
 {
     IFACES=`get_interfaces`
@@ -132,7 +141,21 @@ gen_network_configuration()
         MASK=$(get_mask)
         GATEWAY=$(get_gateway)
 
-        gen_iface_conf > /etc/sysconfig/network-scripts/ifcfg-${DEV}
+        IPV6=$(get_iface_var "IPV6")
+        GATEWAY6=$(get_iface_var "GATEWAY6")
+        CONTEXT_FORCE_IPV4=$(get_iface_var "CONTEXT_FORCE_IPV4")
+
+        (
+            cat <<EOT
+DEVICE=$DEV
+BOOTPROTO=none
+ONBOOT=yes
+TYPE=Ethernet
+EOT
+            [[ -z $IPV6 || -n $CONTEXT_FORCE_IPV4 ]] && gen_iface_conf
+            [[ -n $IPV6 ]] && gen_iface6_conf
+
+        ) > /etc/sysconfig/network-scripts/ifcfg-${DEV}
 
     done
 }