diff --git a/aws/network.tf b/aws/network.tf
index 8c020bd..a4909c9 100644
--- a/aws/network.tf
+++ b/aws/network.tf
@@ -1,28 +1,54 @@
 # This code creates a VPC and Subnet. The code applies just fine. But Systems Manager (SSM) is unusable. Says something isn't right. Been tracking it down for far too long and it's outside the scope of this change anyway so commenting and moving along. This VPC/Subnet issue is tracked in #9.
-# resource "aws_vpc" "opencti_vpc" {
-#   cidr_block = "10.1.0.0/16"
-
-#   tags = {
-#     Name = "OpenCTI VPC"
-#   }
-# }
-
-# resource "aws_subnet" "opencti_subnet" {
-#   vpc_id            = aws_vpc.opencti_vpc.id
-#   cidr_block        = "10.1.10.0/24"
-#   availability_zone = var.availability_zone
-
-#   tags = {
-#     Name = "OpenCTI subnet"
-#   }
-# }
-
-# resource "aws_network_interface" "opencti_nic" {
-#   subnet_id   = aws_subnet.opencti_subnet.id
-#   # private_ips = ["10.1.10.100"]
-#   security_groups = [ aws_security_group.opencti_sg.id ]
-
-#   tags = {
-#     Name = "primary_network_interface"
-#   }
-# }
+resource "aws_vpc" "opencti_vpc" {
+  cidr_block = "10.1.0.0/16"
+
+  tags = {
+    Name = "OpenCTI VPC"
+  }
+}
+
+resource "aws_subnet" "opencti_subnet" {
+  vpc_id            = aws_vpc.opencti_vpc.id
+  cidr_block        = "10.1.10.0/24"
+  availability_zone = var.availability_zone
+
+  tags = {
+    Name = "OpenCTI subnet"
+  }
+}
+
+resource "aws_internet_gateway" "opencti_gw" {
+  vpc_id = aws_vpc.opencti_vpc.id
+
+  tags = {
+    Name = "opencti_internet_gateway"
+  }
+}
+
+resource "aws_route_table" "opencti_rt" {
+  vpc_id = aws_vpc.opencti_vpc.id
+
+  route {
+    cidr_block = "0.0.0.0/0"
+    gateway_id = aws_internet_gateway.opencti_gw.id
+  }
+
+  tags = {
+    Name = "opencti_route_table"
+  }
+}
+
+resource "aws_route_table_association" "opencti_route_assoc" {
+  subnet_id      = aws_subnet.opencti_subnet.id
+  route_table_id = aws_route_table.opencti_rt.id
+}
+
+resource "aws_network_interface" "opencti_nic" {
+  subnet_id = aws_subnet.opencti_subnet.id
+  # private_ips = ["10.1.10.100"]
+  security_groups = [aws_security_group.opencti_sg.id]
+
+  tags = {
+    Name = "primary_network_interface"
+  }
+}
diff --git a/aws/security_group.tf b/aws/security_group.tf
index 5941222..c907015 100644
--- a/aws/security_group.tf
+++ b/aws/security_group.tf
@@ -1,7 +1,7 @@
 # Security group
 resource "aws_security_group" "opencti_sg" {
   name   = "opencti_sg"
-  vpc_id = var.vpc_id
+  vpc_id = aws_vpc.opencti_vpc.id
 
   ingress {
     description = "Allow access to application on port 4000"
diff --git a/aws/terraform.tfvars b/aws/terraform.tfvars
index 9c22645..1f13152 100644
--- a/aws/terraform.tfvars
+++ b/aws/terraform.tfvars
@@ -5,5 +5,3 @@ login_email = "login.email@example.com"
 # region = "us-east-1"
 # root_volume_size = 32
 # storage_bucket = "opencti-storage"
-subnet_id = ""
-vpc_id = ""
diff --git a/aws/variables.tf b/aws/variables.tf
index 7261124..db9bd1b 100644
--- a/aws/variables.tf
+++ b/aws/variables.tf
@@ -1,3 +1,15 @@
+variable "aws_profile" {
+  description = "AWS profile to use"
+  type        = string
+  default     = "open-cti"
+}
+
+variable "shared_config_files" {
+  description = "List of IP addresses allowed to access application on port 4000 of public IP. Default is all IPs."
+  type        = list(string)
+  default     = ["~/.aws/config"]
+}
+
 variable "allowed_ips_application" {
   description = "List of IP addresses allowed to access application on port 4000 of public IP. Default is all IPs."
   type        = list(string)
@@ -39,13 +51,3 @@ variable "storage_bucket" {
   type        = string
   default     = "opencti-storage"
 }
-
-variable "subnet_id" {
-  description = "The subnet ID to use."
-  type        = string
-}
-
-variable "vpc_id" {
-  description = "The VPC ID to use."
-  type        = string
-}
diff --git a/aws/vm.tf b/aws/vm.tf
index 3c73ae1..479e582 100644
--- a/aws/vm.tf
+++ b/aws/vm.tf
@@ -8,7 +8,7 @@ resource "aws_instance" "opencti_instance" {
   root_block_device {
     volume_size = var.root_volume_size
   }
-  subnet_id = var.subnet_id
+  subnet_id = aws_subnet.opencti_subnet.id
 
   # The wrapper script is used by each of the providers and each variable has to be filled out in order to run. Unfortunately, this means that if you change something in one provider, you have to change it in each of the others. It's not ideal, but FYI.
   user_data = templatefile("../userdata/installation-wrapper-script.sh", {