Move bucket into server block