diff --git a/profiles/templates/3.5/6_ac_builder_container/.calculate_directory b/profiles/templates/3.5/6_ac_builder_container/.calculate_directory
new file mode 100644
index 000000000..82fa06ca2
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip env=builder cl_ver>=3.5.4.1&&ac_builder_container==on
diff --git a/profiles/templates/3.5/6_ac_builder_container/README-eng.txt b/profiles/templates/3.5/6_ac_builder_container/README-eng.txt
new file mode 100644
index 000000000..d3d15533c
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/README-eng.txt
@@ -0,0 +1,7 @@
+# Calculate append=skip
+ 
+ The ac_builder_iso event:
+ - iso creation
+
+ Action: iso configuration
+ env: builder
diff --git a/profiles/templates/3.5/6_ac_builder_container/README-rus.txt b/profiles/templates/3.5/6_ac_builder_container/README-rus.txt
new file mode 100644
index 000000000..6a7f79fef
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/README-rus.txt
@@ -0,0 +1,7 @@
+# Calculate append=skip
+
+Событие ac_builder_iso:
+- создание мета файлов для контейнеров
+
+Действие: создание мета файлов для контейнеров
+env: builder
diff --git a/profiles/templates/3.5/6_ac_builder_container/lxc/metadata.yaml b/profiles/templates/3.5/6_ac_builder_container/lxc/metadata.yaml
new file mode 100644
index 000000000..5d942cc8b
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/lxc/metadata.yaml
@@ -0,0 +1,36 @@
+{
+    "architecture": "#-cl_builder_arch_machine-#",
+    "creation_date": #-cl_builder_container_create-timestamp-#,
+    "properties": {
+        "architecture": "#-cl_builder-arch_machine-#",
+        "description": "#-cl_builder_container_dist-# #-cl_builder_container_release-# #-cl_builder_arch_machine-# (#-cl_builder_container_variant-#) (#-cl_builder_container_date-#)"
+        "name": "#-cl_builder_container_dist-#-#-cl_builder_container_release-#-#-cl_builder_arch_machine-#-#-cl_builder_container_variant-#-#-cl_builder_container_date-#",
+        "os": "#-cl_builder_container_dist-#",
+        "release": "#-cl_builder_container_release-#",
+        "variant": "#-cl_builder_container_variant-#"
+    },
+    "calculate": {
+        "os_linux_build": "#-os_builder_linux_build-#",
+        "os_arch_machine": "#-os_builder_arch_machine-#",
+        "os_linux_shortname": "#-os_builder_linux_shortname-#",
+        "os_linux_subname": "#-os_builder_linux_subname-#",
+        "cl_profile_name": "#-cl_builder_profile-name-#",
+        "os_linux_name": "#-os_builder_linux_name-#"
+    },
+    "templates": {
+        "/etc/hostname": {
+            "template": "hostname.tpl",
+            "when": [
+                "create",
+                "copy"
+            ]
+        },
+        "/etc/hosts": {
+            "template": "hosts.tpl",
+            "when": [
+                "create",
+                "copy"
+            ]
+        }
+    }
+}
diff --git a/profiles/templates/3.5/6_ac_builder_container/lxc/templates/hostname.tpl b/profiles/templates/3.5/6_ac_builder_container/lxc/templates/hostname.tpl
new file mode 100644
index 000000000..69a84f111
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/lxc/templates/hostname.tpl
@@ -0,0 +1 @@
+{{ container.name }}
diff --git a/profiles/templates/3.5/6_ac_builder_container/lxc/templates/hosts.tpl b/profiles/templates/3.5/6_ac_builder_container/lxc/templates/hosts.tpl
new file mode 100644
index 000000000..072f108ec
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/lxc/templates/hosts.tpl
@@ -0,0 +1,9 @@
+127.0.0.1   localhost
+127.0.1.1   {{ container.name }}
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/config b/profiles/templates/3.5/6_ac_builder_container/meta/config
new file mode 100644
index 000000000..08be6b360
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/meta/config
@@ -0,0 +1,2 @@
+lxc.include = LXC_TEMPLATE_CONFIG/gentoo.common.conf
+lxc.arch = #-os_builder_arch_machine-#
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/config-user b/profiles/templates/3.5/6_ac_builder_container/meta/config-user
new file mode 100644
index 000000000..179bb4eff
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/meta/config-user
@@ -0,0 +1,3 @@
+lxc.include = LXC_TEMPLATE_CONFIG/gentoo.common.conf
+lxc.include = LXC_TEMPLATE_CONFIG/gentoo.userns.conf
+lxc.arch = #-os_builder_arch_machine-#
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/create-message b/profiles/templates/3.5/6_ac_builder_container/meta/create-message
new file mode 100644
index 000000000..212f97030
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/meta/create-message
@@ -0,0 +1,9 @@
+You just created a Gentoo container (release=#-cl_builder_container_release-#, arch=#-cl_builder_container_arch-#, variant=#-cl_builder_container_variant-#)
+
+To enable sshd, run: rc-update add sshd
+
+For security reason, container images ship without user accounts
+and without a root password.
+
+Use lxc-attach or chroot directly into the rootfs to set a root password
+or create user accounts.
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/excludes-user b/profiles/templates/3.5/6_ac_builder_container/meta/excludes-user
new file mode 100644
index 000000000..cf941ab7d
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/meta/excludes-user
@@ -0,0 +1,272 @@
+./dev/console
+./dev/core
+./dev/full
+./dev/hda
+./dev/hda1
+./dev/hda10
+./dev/hda11
+./dev/hda12
+./dev/hda13
+./dev/hda14
+./dev/hda15
+./dev/hda16
+./dev/hda17
+./dev/hda18
+./dev/hda19
+./dev/hda2
+./dev/hda20
+./dev/hda21
+./dev/hda22
+./dev/hda23
+./dev/hda24
+./dev/hda25
+./dev/hda26
+./dev/hda27
+./dev/hda28
+./dev/hda29
+./dev/hda3
+./dev/hda30
+./dev/hda31
+./dev/hda32
+./dev/hda4
+./dev/hda5
+./dev/hda6
+./dev/hda7
+./dev/hda8
+./dev/hda9
+./dev/input/event0
+./dev/input/event1
+./dev/input/event10
+./dev/input/event11
+./dev/input/event12
+./dev/input/event13
+./dev/input/event14
+./dev/input/event15
+./dev/input/event16
+./dev/input/event17
+./dev/input/event18
+./dev/input/event19
+./dev/input/event2
+./dev/input/event20
+./dev/input/event21
+./dev/input/event22
+./dev/input/event23
+./dev/input/event24
+./dev/input/event25
+./dev/input/event26
+./dev/input/event27
+./dev/input/event28
+./dev/input/event29
+./dev/input/event3
+./dev/input/event30
+./dev/input/event31
+./dev/input/event4
+./dev/input/event5
+./dev/input/event6
+./dev/input/event7
+./dev/input/event8
+./dev/input/event9
+./dev/input/js0
+./dev/input/js1
+./dev/input/js10
+./dev/input/js11
+./dev/input/js12
+./dev/input/js13
+./dev/input/js14
+./dev/input/js15
+./dev/input/js16
+./dev/input/js17
+./dev/input/js18
+./dev/input/js19
+./dev/input/js2
+./dev/input/js20
+./dev/input/js21
+./dev/input/js22
+./dev/input/js23
+./dev/input/js24
+./dev/input/js25
+./dev/input/js26
+./dev/input/js27
+./dev/input/js28
+./dev/input/js29
+./dev/input/js3
+./dev/input/js30
+./dev/input/js31
+./dev/input/js4
+./dev/input/js5
+./dev/input/js6
+./dev/input/js7
+./dev/input/js8
+./dev/input/js9
+./dev/input/keyboard
+./dev/input/mice
+./dev/input/mouse
+./dev/input/mouse0
+./dev/input/mouse1
+./dev/input/mouse10
+./dev/input/mouse11
+./dev/input/mouse12
+./dev/input/mouse13
+./dev/input/mouse14
+./dev/input/mouse15
+./dev/input/mouse16
+./dev/input/mouse17
+./dev/input/mouse18
+./dev/input/mouse19
+./dev/input/mouse2
+./dev/input/mouse20
+./dev/input/mouse21
+./dev/input/mouse22
+./dev/input/mouse23
+./dev/input/mouse24
+./dev/input/mouse25
+./dev/input/mouse26
+./dev/input/mouse27
+./dev/input/mouse28
+./dev/input/mouse29
+./dev/input/mouse3
+./dev/input/mouse30
+./dev/input/mouse4
+./dev/input/mouse5
+./dev/input/mouse6
+./dev/input/mouse7
+./dev/input/mouse8
+./dev/input/mouse9
+./dev/input/uinput
+./dev/mem
+./dev/net/tun
+./dev/null
+./dev/port
+./dev/ptmx
+./dev/random
+./dev/sda
+./dev/sda1
+./dev/sda10
+./dev/sda11
+./dev/sda12
+./dev/sda13
+./dev/sda14
+./dev/sda15
+./dev/sda2
+./dev/sda3
+./dev/sda4
+./dev/sda5
+./dev/sda6
+./dev/sda7
+./dev/sda8
+./dev/sda9
+./dev/sdb
+./dev/sdb1
+./dev/sdb10
+./dev/sdb11
+./dev/sdb12
+./dev/sdb13
+./dev/sdb14
+./dev/sdb15
+./dev/sdb2
+./dev/sdb3
+./dev/sdb4
+./dev/sdb5
+./dev/sdb6
+./dev/sdb7
+./dev/sdb8
+./dev/sdb9
+./dev/sdc
+./dev/sdc1
+./dev/sdc10
+./dev/sdc11
+./dev/sdc12
+./dev/sdc13
+./dev/sdc14
+./dev/sdc15
+./dev/sdc2
+./dev/sdc3
+./dev/sdc4
+./dev/sdc5
+./dev/sdc6
+./dev/sdc7
+./dev/sdc8
+./dev/sdc9
+./dev/sdd
+./dev/sdd1
+./dev/sdd10
+./dev/sdd11
+./dev/sdd12
+./dev/sdd13
+./dev/sdd14
+./dev/sdd15
+./dev/sdd2
+./dev/sdd3
+./dev/sdd4
+./dev/sdd5
+./dev/sdd6
+./dev/sdd7
+./dev/sdd8
+./dev/sdd9
+./dev/tty
+./dev/tty0
+./dev/tty1
+./dev/tty10
+./dev/tty11
+./dev/tty12
+./dev/tty13
+./dev/tty14
+./dev/tty15
+./dev/tty16
+./dev/tty17
+./dev/tty18
+./dev/tty19
+./dev/tty2
+./dev/tty20
+./dev/tty21
+./dev/tty22
+./dev/tty23
+./dev/tty24
+./dev/tty25
+./dev/tty26
+./dev/tty27
+./dev/tty28
+./dev/tty29
+./dev/tty3
+./dev/tty30
+./dev/tty31
+./dev/tty32
+./dev/tty33
+./dev/tty34
+./dev/tty35
+./dev/tty36
+./dev/tty37
+./dev/tty38
+./dev/tty39
+./dev/tty4
+./dev/tty40
+./dev/tty41
+./dev/tty42
+./dev/tty43
+./dev/tty44
+./dev/tty45
+./dev/tty46
+./dev/tty47
+./dev/tty48
+./dev/tty49
+./dev/tty5
+./dev/tty50
+./dev/tty51
+./dev/tty52
+./dev/tty53
+./dev/tty54
+./dev/tty55
+./dev/tty56
+./dev/tty57
+./dev/tty58
+./dev/tty59
+./dev/tty6
+./dev/tty60
+./dev/tty61
+./dev/tty62
+./dev/tty63
+./dev/tty7
+./dev/tty8
+./dev/tty9
+./dev/urandom
+./dev/zero
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/expiry b/profiles/templates/3.5/6_ac_builder_container/meta/expiry
new file mode 100644
index 000000000..88b5a0711
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/meta/expiry
@@ -0,0 +1 @@
+#-cl_builder_container_expiry_timestamp-#
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/templates b/profiles/templates/3.5/6_ac_builder_container/meta/templates
new file mode 100644
index 000000000..2db792ff3
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_builder_container/meta/templates
@@ -0,0 +1 @@
+/etc/conf.d/hostname
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname b/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
index e801f8583..e83c8fbbc 100644
--- a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
+++ b/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
@@ -1,3 +1,7 @@
 # Calculate format=openrc
 
+#?cl_ver<3.5.4.1||cl_builder_container_set==off#
 hostname="calculate"
+#!cl_ver#
+hostname="LXC_NAME"
+#cl_ver#