diff --git a/envs/monkey_zoo/docs/fullDocs.md b/envs/monkey_zoo/docs/fullDocs.md
index 9d8e8b3c4..a7c523080 100644
--- a/envs/monkey_zoo/docs/fullDocs.md
+++ b/envs/monkey_zoo/docs/fullDocs.md
@@ -11,8 +11,6 @@ This document describes Infection Monkey’s test network, how to deploy and use
 [Nr. 3 Hadoop](#_Toc526517183)<br>
 [Nr. 4 Elastic](#_Toc526517184)<br>
 [Nr. 5 Elastic](#_Toc526517185)<br>
-[Nr. 6 Sambacry](#_Toc536021459)<br>
-[Nr. 7 Sambacry](#_Toc536021460)<br>
 [Nr. 8 Shellshock](#_Toc536021461)<br>
 [Nr. 9 Tunneling M1](#_Toc536021462)<br>
 [Nr. 10 Tunneling M2](#_Toc536021463)<br>
@@ -322,86 +320,6 @@ Update all requirements using deployment script:<br>
 </tbody>
 </table>
 
-<table>
-<thead>
-<tr class="header">
-<th><p><span id="_Toc536021459" class="anchor"></span>Nr. <strong>6</strong> Sambacry</p>
-<p>(10.2.2.6)</p></th>
-<th>(Not implemented)</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>OS:</td>
-<td><strong>Ubuntu 16.04.05 x64</strong></td>
-</tr>
-<tr class="even">
-<td>Software:</td>
-<td>Samba &gt; 3.5.0 and &lt; 4.6.4, 4.5.10 and 4.4.14</td>
-</tr>
-<tr class="odd">
-<td>Default server’s port:</td>
-<td>-</td>
-</tr>
-<tr class="even">
-<td>Root password:</td>
-<td>;^TK`9XN_x^</td>
-</tr>
-<tr class="odd">
-<td>Server’s config:</td>
-<td></td>
-</tr>
-<tr class="even">
-<td>Scan results:</td>
-<td>Machine exploited using Sambacry exploiter</td>
-</tr>
-<tr class="odd">
-<td>Notes:</td>
-<td></td>
-</tr>
-</tbody>
-</table>
-
-<table>
-<thead>
-<tr class="header">
-<th><p><span id="_Toc536021460" class="anchor"></span>Nr. <strong>7</strong> Sambacry</p>
-<p>(10.2.2.7)</p></th>
-<th>(Not implemented)</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>OS:</td>
-<td><strong>Ubuntu 16.04.05 x32</strong></td>
-</tr>
-<tr class="even">
-<td>Software:</td>
-<td>Samba &gt; 3.5.0 and &lt; 4.6.4, 4.5.10 and 4.4.14</td>
-</tr>
-<tr class="odd">
-<td>Default server’s port:</td>
-<td>-</td>
-</tr>
-<tr class="even">
-<td>Root password:</td>
-<td>*.&amp;A7/W}Rc$</td>
-</tr>
-<tr class="odd">
-<td>Server’s config:</td>
-<td></td>
-</tr>
-<tr class="even">
-<td>Scan results:</td>
-<td>Machine exploited using Sambacry exploiter</td>
-</tr>
-<tr class="odd">
-<td>Notes:</td>
-<td></td>
-</tr>
-</tbody>
-</table>
-
 <table>
 <thead>
 <tr class="header">
diff --git a/envs/monkey_zoo/terraform/images.tf b/envs/monkey_zoo/terraform/images.tf
index 05cc05048..58a92a99e 100644
--- a/envs/monkey_zoo/terraform/images.tf
+++ b/envs/monkey_zoo/terraform/images.tf
@@ -16,11 +16,6 @@ data "google_compute_image" "elastic-5" {
   project = local.monkeyzoo_project
 }
 
-/*
-data "google_compute_image" "sambacry-6" {
-  name = "sambacry-6"
-}
-*/
 data "google_compute_image" "shellshock-8" {
   name = "shellshock-8"
   project = local.monkeyzoo_project
diff --git a/envs/monkey_zoo/terraform/monkey_zoo.tf b/envs/monkey_zoo/terraform/monkey_zoo.tf
index cd9675732..d1ca528bb 100644
--- a/envs/monkey_zoo/terraform/monkey_zoo.tf
+++ b/envs/monkey_zoo/terraform/monkey_zoo.tf
@@ -106,39 +106,6 @@ resource "google_compute_instance_from_template" "elastic-5" {
   }
 }
 
-/* Couldn't find ubuntu packages for required samba version (too old).
-resource "google_compute_instance_from_template" "sambacry-6" {
-  name = "${local.resource_prefix}sambacry-6"
-  source_instance_template = "${local.default_ubuntu}"
-  boot_disk{
-    initialize_params {
-      image = "${data.google_compute_image.sambacry-6.self_link}"
-    }
-  }
-  network_interface {
-    subnetwork="${local.resource_prefix}monkeyzoo-main"
-    network_ip="10.2.2.6"
-  }
-}
-*/
-
-/* We need custom 32 bit Ubuntu machine for this (there are no 32 bit ubuntu machines in GCP).
-resource "google_compute_instance_from_template" "sambacry-7" {
-  name = "${local.resource_prefix}sambacry-7"
-  source_instance_template = "${local.default_ubuntu}"
-  boot_disk {
-    initialize_params {
-      // Add custom image to cloud
-      image = "ubuntu32"
-    }
-  }
-  network_interface {
-    subnetwork="${local.resource_prefix}monkeyzoo-main"
-    network_ip="10.2.2.7"
-  }
-}
-*/
-
 resource "google_compute_instance_from_template" "shellshock-8" {
   name = "${local.resource_prefix}shellshock-8"
   source_instance_template = local.default_ubuntu