diff --git a/bin/start-postgres-localstack b/bin/start-postgres-localstack
index 4f4ddcd75..9db11818e 100755
--- a/bin/start-postgres-localstack
+++ b/bin/start-postgres-localstack
@@ -77,7 +77,7 @@ fi
 
 WORK_ITEM_UPDATE_QUEUE=${WORK_ITEM_UPDATE_QUEUE:-work-item-update-queue.fifo}
 LARGE_WORK_ITEM_UPDATE_QUEUE=${LARGE_WORK_ITEM_UPDATE_QUEUE:-large-work-item-update-queue.fifo}
-WORK_ITEM_SCHEDULER_QUEUE=${WORK_ITEM_SCHEDULER_QUEUE:-work-item-scheduler-queue.fifo}
+WORK_ITEM_SCHEDULER_QUEUE=${WORK_ITEM_SCHEDULER_QUEUE:-work-item-scheduler-queue}
 STAGING_BUCKET=${STAGING_BUCKET:-local-staging-bucket}
 ARTIFACT_BUCKET=${ARTIFACT_BUCKET:-local-artifact-bucket}
 UPLOAD_BUCKET=${UPLOAD_BUCKET:-local-upload-bucket}
@@ -93,7 +93,7 @@ s3.put_bucket_acl(Bucket='${ARTIFACT_BUCKET}', ACL='public-read') # allows us to
 sqs = boto3.client('sqs', endpoint_url='http://localhost:4566', region_name='us-west-2')
 sqs.create_queue(QueueName='${WORK_ITEM_UPDATE_QUEUE}', Attributes={'FifoQueue': 'true', 'ContentBasedDeduplication': 'true'})
 sqs.create_queue(QueueName='${LARGE_WORK_ITEM_UPDATE_QUEUE}', Attributes={'VisibilityTimeout': '3600', 'FifoQueue': 'true', 'ContentBasedDeduplication': 'true'})
-sqs.create_queue(QueueName='${WORK_ITEM_SCHEDULER_QUEUE}', Attributes={'FifoQueue': 'true', 'ContentBasedDeduplication': 'true'})
+sqs.create_queue(QueueName='${WORK_ITEM_SCHEDULER_QUEUE}')
 "
 
 # For some develpers using Linux, artifact repositories were not working correctly without
diff --git a/kubernetes-services/work-scheduler/env-defaults b/kubernetes-services/work-scheduler/env-defaults
index f1c75f557..003d0e462 100644
--- a/kubernetes-services/work-scheduler/env-defaults
+++ b/kubernetes-services/work-scheduler/env-defaults
@@ -34,7 +34,7 @@ QUEUE_LONG_POLLING_WAIT_TIME_SEC=20
 CMR_MAX_PAGE_SIZE=2000
 
 # SQS queue used to request scheduling of work items for a service
-WORK_ITEM_SCHEDULER_QUEUE_URL=http://localstack:4566/queue/work-item-scheduler-queue.fifo
+WORK_ITEM_SCHEDULER_QUEUE_URL=http://localstack:4566/queue/work-item-scheduler-queue
 # Maximum number of messages to pull from the scheduler queue at once
 WORK_ITEM_SCHEDULER_QUEUE_MAX_BATCH_SIZE=10
 # Maximum number of getMessage requests to make to the scheduler queue on each pass