fix for permanent docker containers
refactored