diff --git a/main.tf b/main.tf
index 089b55b..afed1cd 100644
--- a/main.tf
+++ b/main.tf
@@ -62,7 +62,13 @@ data "template_file" "user_data" {
   template = file("${path.module}/template/user_data.sh")
 }
 
+resource "aws_eip" "this" {
+  vpc      = true
+  instance = aws_instance.instance.id[0]
+}
+
 resource "aws_network_interface" "interface" {
+  count = var.enable_bastion ? 1 : 0
   subnet_id             = var.subnet_id
   security_groups       = [aws_security_group.ami[0].id]
 
@@ -85,7 +91,7 @@ resource "aws_instance" "instance" {
 
   ami                         = local.aws_ami
   instance_type               = var.instance_type
-  associate_public_ip_address = true
+  #associate_public_ip_address = true
   ebs_optimized               = var.ebs_optimized
   #subnet_id                   = var.subnet_id
   #vpc_security_group_ids      = [aws_security_group.ami[0].id]